summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Singh <csingh43@bloomberg.net>2019-03-22 11:44:51 +0000
committerChandan Singh <csingh43@bloomberg.net>2019-03-22 12:21:55 +0000
commit8d5c760fee8b77d70f1fcd54178015e928b96859 (patch)
tree3c98f4266291cba2e56f85b09bf8fcb17fc8af76
parent87e00dd789bf0cae25a4390ae60e36babd5e1493 (diff)
downloadbuildstream-8d5c760fee8b77d70f1fcd54178015e928b96859.tar.gz
.gitlab-ci.yml: Update CI to use images from GitLab Registry
The testsuite images have been deprecated and removed from Docker Hub. Instead, we need to use their counterparts from the GitLab Container Registry. We also need to mark `systemd-udev` as user-installed so that we can remove `ostree` etc.
-rw-r--r--.gitlab-ci.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1225ef15b..061bb398b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: buildstream/testsuite-debian:9-5da27168-32c47d1c
+image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:9-master-46405991
cache:
key: "$CI_JOB_NAME-"
@@ -44,25 +44,25 @@ variables:
- .coverage-reports
tests-debian-9:
- image: buildstream/testsuite-debian:9-5da27168-32c47d1c
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:9-master-46405991
<<: *tests
tests-fedora-27:
- image: buildstream/testsuite-fedora:27-5da27168-32c47d1c
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:27-master-46405991
<<: *tests
tests-fedora-28:
- image: buildstream/testsuite-fedora:28-5da27168-32c47d1c
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991
<<: *tests
tests-ubuntu-18.04:
- image: buildstream/testsuite-ubuntu:18.04-5da27168-32c47d1c
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991
<<: *tests
tests-unix:
# Use fedora here, to a) run a test on fedora and b) ensure that we
# can get rid of ostree - this is not possible with debian-8
- image: buildstream/testsuite-fedora:27-5da27168-32c47d1c
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:27-master-46405991
<<: *tests
variables:
BST_FORCE_BACKEND: "unix"
@@ -72,7 +72,7 @@ tests-unix:
# We remove the Bubblewrap and OSTree packages here so that we catch any
# codepaths that try to use them. Removing OSTree causes fuse-libs to
# disappear unless we mark it as user-installed.
- - dnf mark install fuse-libs
+ - dnf mark install fuse-libs systemd-udev
- dnf erase -y bubblewrap ostree
# Since the unix platform is required to run as root, no user change required