mirror of
https://github.com/elastic/kibana.git
synced 2025-06-28 11:05:39 -04:00
[artifacts] Stabilize package testing (#134854)
* bump ansible logging verbosity
* upgrade base os
* update base images
* add specificity to docker image glob
* limit memory
* bump base vm memory
* more cpu
* decrease verbosity
* less downloads
* disable shared symlinks
* more logging
* bump concurrency to test stability
* add concurrency group
* revert
* parallelism
* Revert "parallelism"
This reverts commit 4cc00f7144
.
This commit is contained in:
parent
e564f1f5bc
commit
7fd3beee4e
7 changed files with 35 additions and 22 deletions
|
@ -9,10 +9,10 @@ echo "--- Package Testing for $TEST_PACKAGE"
|
||||||
mkdir -p target
|
mkdir -p target
|
||||||
cd target
|
cd target
|
||||||
if [[ "$TEST_PACKAGE" == "deb" ]]; then
|
if [[ "$TEST_PACKAGE" == "deb" ]]; then
|
||||||
buildkite-agent artifact download 'kibana-*.deb' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
|
buildkite-agent artifact download 'kibana-*-amd64.deb' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
|
||||||
KIBANA_IP_ADDRESS="192.168.56.5"
|
KIBANA_IP_ADDRESS="192.168.56.5"
|
||||||
elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
|
elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
|
||||||
buildkite-agent artifact download 'kibana-*.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
|
buildkite-agent artifact download 'kibana-*-x86_64.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
|
||||||
KIBANA_IP_ADDRESS="192.168.56.6"
|
KIBANA_IP_ADDRESS="192.168.56.6"
|
||||||
elif [[ "$TEST_PACKAGE" == "docker" ]]; then
|
elif [[ "$TEST_PACKAGE" == "docker" ]]; then
|
||||||
buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION*-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
|
buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION*-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
|
||||||
|
@ -30,10 +30,14 @@ node scripts/es snapshot \
|
||||||
while ! timeout 1 bash -c "echo > /dev/tcp/localhost/9200"; do sleep 30; done
|
while ! timeout 1 bash -c "echo > /dev/tcp/localhost/9200"; do sleep 30; done
|
||||||
|
|
||||||
function echoKibanaLogs {
|
function echoKibanaLogs {
|
||||||
echo '--- Kibana logs'
|
|
||||||
if [[ "$TEST_PACKAGE" == "deb" ]] || [[ "$TEST_PACKAGE" == "rpm" ]]; then
|
if [[ "$TEST_PACKAGE" == "deb" ]] || [[ "$TEST_PACKAGE" == "rpm" ]]; then
|
||||||
|
echo "--- /var/log/kibana/kibana.log "
|
||||||
vagrant ssh $TEST_PACKAGE -t -c 'sudo cat /var/log/kibana/kibana.log'
|
vagrant ssh $TEST_PACKAGE -t -c 'sudo cat /var/log/kibana/kibana.log'
|
||||||
|
|
||||||
|
echo "--- Journal "
|
||||||
|
vagrant ssh $TEST_PACKAGE -t -c 'sudo journalctl -u kibana.service --no-pager'
|
||||||
elif [[ "$TEST_PACKAGE" == "docker" ]]; then
|
elif [[ "$TEST_PACKAGE" == "docker" ]]; then
|
||||||
|
echo '--- Docker logs'
|
||||||
vagrant ssh $TEST_PACKAGE -t -c 'sudo docker logs kibana'
|
vagrant ssh $TEST_PACKAGE -t -c 'sudo docker logs kibana'
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
23
test/package/Vagrantfile
vendored
23
test/package/Vagrantfile
vendored
|
@ -1,12 +1,13 @@
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.synced_folder '../../target/', '/packages'
|
config.vm.synced_folder '../../target/', '/packages', SharedFoldersEnableSymlinksCreate: false
|
||||||
config.vm.boot_timeout = 600
|
config.vm.boot_timeout = 600
|
||||||
config.vm.define "deb" do |deb|
|
config.vm.define "deb" do |deb|
|
||||||
deb.vm.provider :virtualbox do |vb|
|
deb.vm.provider :virtualbox do |vb|
|
||||||
vb.memory = 2048
|
vb.memory = 4096
|
||||||
|
vb.cpus = 2
|
||||||
end
|
end
|
||||||
deb.vm.box = 'elastic/debian-9-x86_64'
|
deb.vm.box = 'ubuntu/jammy64'
|
||||||
deb.vm.provision "ansible_local" do |ansible|
|
deb.vm.provision "ansible" do |ansible|
|
||||||
ansible.playbook = "deb.yml"
|
ansible.playbook = "deb.yml"
|
||||||
end
|
end
|
||||||
deb.vm.network "private_network", ip: "192.168.56.5"
|
deb.vm.network "private_network", ip: "192.168.56.5"
|
||||||
|
@ -14,10 +15,11 @@ Vagrant.configure("2") do |config|
|
||||||
|
|
||||||
config.vm.define "rpm" do |rpm|
|
config.vm.define "rpm" do |rpm|
|
||||||
rpm.vm.provider :virtualbox do |vb|
|
rpm.vm.provider :virtualbox do |vb|
|
||||||
vb.memory = 2048
|
vb.memory = 4096
|
||||||
|
vb.cpus = 2
|
||||||
end
|
end
|
||||||
rpm.vm.box = 'elastic/centos-7-x86_64'
|
rpm.vm.box = 'almalinux/9'
|
||||||
rpm.vm.provision "ansible_local" do |ansible|
|
rpm.vm.provision "ansible" do |ansible|
|
||||||
ansible.playbook = "rpm.yml"
|
ansible.playbook = "rpm.yml"
|
||||||
end
|
end
|
||||||
rpm.vm.network "private_network", ip: "192.168.56.6"
|
rpm.vm.network "private_network", ip: "192.168.56.6"
|
||||||
|
@ -25,10 +27,11 @@ Vagrant.configure("2") do |config|
|
||||||
|
|
||||||
config.vm.define "docker" do |docker|
|
config.vm.define "docker" do |docker|
|
||||||
docker.vm.provider :virtualbox do |vb|
|
docker.vm.provider :virtualbox do |vb|
|
||||||
vb.memory = 2048
|
vb.memory = 4096
|
||||||
|
vb.cpus = 2
|
||||||
end
|
end
|
||||||
docker.vm.box = 'elastic/ubuntu-18.04-x86_64'
|
docker.vm.box = 'ubuntu/jammy64'
|
||||||
docker.vm.provision "ansible_local" do |ansible|
|
docker.vm.provision "ansible" do |ansible|
|
||||||
ansible.playbook = "docker.yml"
|
ansible.playbook = "docker.yml"
|
||||||
end
|
end
|
||||||
docker.vm.network "private_network", ip: "192.168.56.7"
|
docker.vm.network "private_network", ip: "192.168.56.7"
|
||||||
|
|
2
test/package/ansible.cfg
Normal file
2
test/package/ansible.cfg
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
[defaults]
|
||||||
|
gathering = explicit
|
|
@ -26,6 +26,12 @@
|
||||||
dest: /etc/kibana/kibana.yml
|
dest: /etc/kibana/kibana.yml
|
||||||
register: config
|
register: config
|
||||||
|
|
||||||
|
- name: copy node.options
|
||||||
|
become: yes
|
||||||
|
template:
|
||||||
|
src: templates/node.options
|
||||||
|
dest: /etc/kibana/node.options
|
||||||
|
|
||||||
- name: start kibana
|
- name: start kibana
|
||||||
become: yes
|
become: yes
|
||||||
systemd:
|
systemd:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- name: find docker image
|
- name: find docker image
|
||||||
find:
|
find:
|
||||||
paths: /packages/
|
paths: /packages/
|
||||||
patterns: kibana-*-docker-image.tar.gz
|
patterns: kibana-[0-9]*-docker-image.tar.gz
|
||||||
register: kibana_docker
|
register: kibana_docker
|
||||||
|
|
||||||
- name: load image
|
- name: load image
|
||||||
|
|
|
@ -27,15 +27,11 @@
|
||||||
dest: /etc/kibana/kibana.yml
|
dest: /etc/kibana/kibana.yml
|
||||||
register: config
|
register: config
|
||||||
|
|
||||||
- name: open port 5601/tcp
|
- name: copy node.options
|
||||||
become: yes
|
become: yes
|
||||||
command:
|
template:
|
||||||
cmd: firewall-cmd --zone=public --permanent --add-port=5601/tcp
|
src: templates/node.options
|
||||||
|
dest: /etc/kibana/node.options
|
||||||
- name: reload firewall
|
|
||||||
become: yes
|
|
||||||
command:
|
|
||||||
cmd: firewall-cmd --reload
|
|
||||||
|
|
||||||
- name: start kibana
|
- name: start kibana
|
||||||
become: yes
|
become: yes
|
||||||
|
|
2
test/package/templates/node.options
Normal file
2
test/package/templates/node.options
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
--max-old-space-size=812
|
||||||
|
--unhandled-rejections=warn
|
Loading…
Add table
Add a link
Reference in a new issue