diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2019-09-09 13:22:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 13:22:47 -0700 |
| commit | 8ea358d849057e890d2b934c72a75de8494516d2 (patch) | |
| tree | f91ad27f9c8fe06d8eb25806e0a367db5c5975b6 | |
| parent | c30f9c683388f4610251afcc50c203a14f299399 (diff) | |
| download | spack-8ea358d849057e890d2b934c72a75de8494516d2.tar.gz spack-8ea358d849057e890d2b934c72a75de8494516d2.tar.bz2 spack-8ea358d849057e890d2b934c72a75de8494516d2.tar.xz spack-8ea358d849057e890d2b934c72a75de8494516d2.zip | |
Fix CD: Packages Service First (#12764)
* Fix CD: Packages Service First
Build the packages.spack.io service images first, so they are
guaranteed to be pushed even if further images fail to build.
Fix the query to the `spack` script executed in later builds.
* CD: Remove Spack Images
Now done on Dockerhub.
| -rwxr-xr-x | share/spack/qa/run-docker-tests | 83 |
1 files changed, 2 insertions, 81 deletions
diff --git a/share/spack/qa/run-docker-tests b/share/spack/qa/run-docker-tests index 5ba2953f33..9030d8169c 100755 --- a/share/spack/qa/run-docker-tests +++ b/share/spack/qa/run-docker-tests @@ -32,90 +32,11 @@ ensure_docker_login() { return $__login_success } -build_docker_image() { - local dockerfile="$1" ; shift - local build_ctx="$1" ; shift - local image_name="$1" ; shift - local first_tag="$1" - local tags="" - if [ -n "$*" ] ; then - tags="$( echo " $*" | sed "s| *| -t ${image_name}:|g" )" - tags="${tags:1}" - fi - - if [ -n "$first_tag" ] ; then - first_tag=":$first_tag" - fi - - local cache="" - if docker pull "${image_name}${first_tag}" ; then - local cache="--cache-from ${image_name}${first_tag}" - fi - - ( set +e - docker build -f "$dockerfile" $cache $tags "$build_ctx" ) - return $? -} - -push_docker_image() { - local image_name="$1" ; shift - local result=0 - while [ -n "$*" ] ; do - local tag="$1" ; shift - ( - set +e - docker push "${image_name}:${tag}" - ) - result="$?" - [ "$result" '=' '0' ] || break - done - return $result -} - -SPACK_VERSION="$( ../../../bin/spack --version )" - -build_docker_image centos-6.dockerfile ../../.. spack/spack \ - "${SPACK_VERSION}-centos-6" \ - "centos-6" - -build_docker_image centos-7.dockerfile ../../.. spack/spack \ - "${SPACK_VERSION}-centos-7" \ - "${SPACK_VERSION}" \ - "centos-7" \ - "latest" - -build_docker_image ubuntu-1604.dockerfile ../../.. spack/spack \ - "${SPACK_VERSION}-ubuntu-16.04" \ - "${SPACK_VERSION}-ubuntu-xenial" \ - "ubuntu-16.04" \ - "ubuntu-xenial" - -build_docker_image ubuntu-1804.dockerfile ../../.. spack/spack \ - "${SPACK_VERSION}-ubuntu-18.04" \ - "${SPACK_VERSION}-ubuntu-bionic" \ - "ubuntu-18.04" \ - "ubuntu-bionic" - +# packages.spack.io service spack list --format version_json > packages.json ./share/spack/packages/build-image.sh - if [ "$TEST_SUITE" '=' "docker" -a \ "$TRAVIS_EVENT_TYPE" != "pull_request" ] && ensure_docker_login ; then - push_docker_image "spack/spack" \ - "${SPACK_VERSION}-centos-6" \ - "${SPACK_VERSION}-centos-7" \ - "${SPACK_VERSION}-ubuntu-16.04" \ - "${SPACK_VERSION}-ubuntu-18.04" \ - "${SPACK_VERSION}-ubuntu-xenial" \ - "${SPACK_VERSION}-ubuntu-bionic" \ - "${SPACK_VERSION}" \ - "centos-6" \ - "centos-7" \ - "ubuntu-16.04" \ - "ubuntu-18.04" \ - "ubuntu-xenial" \ - "ubuntu-bionic" \ - "latest" - ./share/spack/packages/push-image.sh fi + |