|
7 | 7 | VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/master/ci/logstash_releases.json"
|
8 | 8 |
|
9 | 9 |
|
10 |
| -download_and_load_docker_snapshot_artifact() { |
| 10 | +pull_docker_snapshot() { |
11 | 11 | project="${1?project name required}"
|
12 |
| - |
13 |
| - artifact_type="docker-image" |
14 |
| - artifact_name_base="${project}${DISTRIBUTION_SUFFIX}-${ELASTIC_STACK_VERSION}-${artifact_type}" |
15 |
| - echo "Downloading snapshot docker image: ${project}${DISTRIBUTION_SUFFIX} (${ELASTIC_STACK_VERSION})" |
16 |
| - |
17 |
| - artifact_name_noarch="${artifact_name_base}.tar.gz" |
18 |
| - artifact_name_arch="${artifact_name_base}-x86_64.tar.gz" |
19 |
| - |
20 |
| - jq_extract_artifact_url=".build.projects.\"${project}\".packages | (.\"${artifact_name_noarch}\" // .\"${artifact_name_arch}\") | .url" |
21 |
| - |
22 |
| - artifact_list=$(curl --silent "https://artifacts-api.elastic.co/v1/versions/${ELASTIC_STACK_VERSION}/builds/latest") |
23 |
| - artifact_url=$(echo "${artifact_list}" | jq --raw-output "${jq_extract_artifact_url}") |
24 |
| - |
25 |
| - if [[ "${artifact_url}" == "null" ]]; then |
26 |
| - echo "Failed to find '${artifact_name_noarch}'" |
27 |
| - echo "Failed to find '${artifact_name_arch}'" |
28 |
| - echo "Listing:" |
29 |
| - echo "${artifact_list}" | jq --raw-output ".build.projects.\"${project}\".packages | keys | map(select(contains(\"${artifact_type}\")))" |
30 |
| - return 1 |
31 |
| - fi |
32 |
| - |
33 |
| - echo "${artifact_url}" |
34 |
| - |
35 |
| - cd /tmp |
36 |
| - curl "${artifact_url}" > "${project}-docker-image.tar.gz" |
37 |
| - tar xfvz "${project}-docker-image.tar.gz" repositories |
38 |
| - echo "Loading ${project} docker image: " |
39 |
| - cat repositories |
40 |
| - docker load < "${project}-docker-image.tar.gz" |
41 |
| - rm "${project}-docker-image.tar.gz" |
42 |
| - cd - |
| 12 | + local docker_image="docker.elastic.co/${project}/${project}${DISTRIBUTION_SUFFIX}:${ELASTIC_STACK_VERSION}" |
| 13 | + echo "Pulling $docker_image" |
| 14 | + docker pull "$docker_image" |
43 | 15 | }
|
44 | 16 |
|
45 | 17 | if [ "$ELASTIC_STACK_VERSION" ]; then
|
@@ -68,9 +40,9 @@ if [ "$ELASTIC_STACK_VERSION" ]; then
|
68 | 40 | echo "Testing against version: $ELASTIC_STACK_VERSION (distribution: ${DISTRIBUTION:-'default'})"
|
69 | 41 |
|
70 | 42 | if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then
|
71 |
| - download_and_load_docker_snapshot_artifact "logstash" |
| 43 | + pull_docker_snapshot "logstash" |
72 | 44 | if [ "$INTEGRATION" == "true" ]; then
|
73 |
| - download_and_load_docker_snapshot_artifact "elasticsearch" |
| 45 | + pull_docker_snapshot "elasticsearch" |
74 | 46 | fi
|
75 | 47 | fi
|
76 | 48 |
|
|
0 commit comments