[package-testing] Fix docker testing (#123249)

This commit is contained in:
Brian Seeders 2022-01-18 13:03:24 -05:00 committed by GitHub
parent b5aadc26b5
commit 7a70f857f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions

View file

@ -22,6 +22,9 @@ KIBANA_PKG_BRANCH="$(jq -r .branch "$KIBANA_DIR/package.json")"
export KIBANA_PKG_BRANCH
export KIBANA_BASE_BRANCH="$KIBANA_PKG_BRANCH"
KIBANA_PKG_VERSION="$(jq -r .version "$KIBANA_DIR/package.json")"
export KIBANA_PKG_VERSION
export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export CHROMEDRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
export RE2_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"

View file

@ -4,9 +4,10 @@ set -euo pipefail
.buildkite/scripts/bootstrap.sh
echo "--- Build Kibana Distribution"
node scripts/build --all-platforms --debug --skip-docker-cloud --skip-docker-ubi --skip-docker-contexts
DOCKER_FILE="kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz"
cd target
buildkite-agent artifact upload "./*-docker-image.tar.gz;./*.deb;./*.rpm"
buildkite-agent artifact upload "./$DOCKER_FILE;./*.deb;./*.rpm"
cd ..

View file

@ -15,7 +15,7 @@ elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
buildkite-agent artifact download 'kibana-*.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
KIBANA_IP_ADDRESS="192.168.50.6"
elif [[ "$TEST_PACKAGE" == "docker" ]]; then
buildkite-agent artifact download 'kibana-*-docker-image.tar.gz' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
KIBANA_IP_ADDRESS="192.168.50.7"
fi
cd ..

View file

@ -7,8 +7,8 @@
- name: load image
become: yes
docker_image:
name: kibana
load_path: "{{ kibana_docker.files[0].path }}"
name: "{{ kibana_docker.files[0].path | basename| regex_replace('kibana-(.*)-docker-image.tar.gz', 'docker.elastic.co/kibana/kibana:\\1') }}"
load_path: '{{ kibana_docker.files[0].path }}'
timeout: 300
source: load
state: present
@ -22,5 +22,5 @@
env:
SERVER_HOST: 0.0.0.0
ELASTICSEARCH_HOSTS: http://192.168.50.1:9200
ELASTICSEARCH_USERNAME: "{{ elasticsearch_username }}"
ELASTICSEARCH_PASSWORD: "{{ elasticsearch_password }}"
ELASTICSEARCH_USERNAME: '{{ elasticsearch_username }}'
ELASTICSEARCH_PASSWORD: '{{ elasticsearch_password }}'