diff options
author | Jürg Billeter <j@bitron.ch> | 2020-02-03 17:08:16 +0000 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2020-02-03 17:08:16 +0000 |
commit | db6207f49419d272be28527e3c5c9b1ef5c2ecdd (patch) | |
tree | 60fb98d110369ef1898788cb67c1561754f588d0 | |
parent | 47fb42973f181d5676134e0e0977d53cba3ae6c8 (diff) | |
parent | 48ff666e0ec25a48f4a06312725b3722dfc7528d (diff) | |
download | buildstream-db6207f49419d272be28527e3c5c9b1ef5c2ecdd.tar.gz |
Merge branch 'juerg/buildbox' into 'master'
.gitlab-ci.yml: Update BuildBox components to 0.0.6
See merge request BuildStream/buildstream!1813
-rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a230e191..0f65e320a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: # Our own variables # Version of the docker images we should use for all the images. # This is taken from buildstream/buildstream-docker-images - DOCKER_IMAGE_VERSION: master-105004115 + DOCKER_IMAGE_VERSION: master-114538533 PYTEST_ADDOPTS: "--color=yes" INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache" PYTEST_ARGS: "--color=yes --integration -n 2" @@ -302,9 +302,9 @@ tests-wsl-master: - df -h - PATH=/root/.local/bin:$PATH tox --version script: - # Install static buildbox-casd binary - - wget https://buildbox-casd-binaries.nyc3.cdn.digitaloceanspaces.com/buildbox-casd-x86_64-linux-20191104-598100dd.tar.xz - - tar -C /root/.local/bin -xf buildbox-casd-x86_64-linux-20191104-598100dd.tar.xz + # Install static buildbox binaries + - wget https://buildbox-casd-binaries.nyc3.cdn.digitaloceanspaces.com/buildbox-x86_64-linux-20200203-48361da7.tar.xz + - tar -C /root/.local/bin -xf buildbox-x86_64-linux-20200203-48361da7.tar.xz - PATH=/root/.local/bin:$PATH ${TEST_COMMAND} only: @@ -322,9 +322,9 @@ tests-wsl-non-master: - df -h - PATH=/root/.local/bin:$PATH tox --version script: - # Install static buildbox-casd binary - - wget https://buildbox-casd-binaries.nyc3.cdn.digitaloceanspaces.com/buildbox-casd-x86_64-linux-20191104-598100dd.tar.xz - - tar -C /root/.local/bin -xf buildbox-casd-x86_64-linux-20191104-598100dd.tar.xz + # Install static buildbox binaries + - wget https://buildbox-casd-binaries.nyc3.cdn.digitaloceanspaces.com/buildbox-x86_64-linux-20200203-48361da7.tar.xz + - tar -C /root/.local/bin -xf buildbox-x86_64-linux-20200203-48361da7.tar.xz - PATH=/root/.local/bin:$PATH ${TEST_COMMAND} when: manual |