container devel

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b365334e1000615bae48c60ad229dd8d0f784c7e..6995d1113f2257020757dd3ea2be9e1fe9dc1f4c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  XEN_REGISTRY: registry.gitlab.com/xen-project/xen
+  XEN_REGISTRY: registry.gitlab.com/xen-project/people/andrewcoop/xen
   SELECTED_JOBS_ONLY:
     description: "Regex to select only some jobs, must be enclosed with /. For example /job1|job2/"
   XEN_CI_REBUILD_CONTAINERS:

diff --git a/automation/gitlab-ci/containers.yaml b/automation/gitlab-ci/containers.yaml
index 25e8bdc34bd3ee42660ed09337e53519a480cc0b..e04e53bdd8956c12be056227082ba1dd924ba65f 100644 (file)
--- a/automation/gitlab-ci/containers.yaml
+++ b/automation/gitlab-ci/containers.yaml
@@ -3,8 +3,6 @@
   image: docker:stable
   tags:
     - container-builder
-  rules:
-    - if: $XEN_CI_REBUILD_CONTAINERS
   services:
     - docker:dind
   before_script:
@@ -16,14 +14,36 @@
   after_script:
     - docker logout
 
-container-archlinux-current:
+.container-schedule-tmpl:
   extends:
     - .container-build-tmpl
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: always
+    - when: manual
+
+container-archlinux-current:
+  extends:
+    - .container-schedule-tmpl
   variables:
     CONTAINER: "archlinux:current"
 
 container-opensuse-tumbleweed-x86_64:
   extends:
-    - .container-build-tmpl
+    - .container-schedule-tmpl
   variables:
     CONTAINER: "opensuse:tumbleweed-x86_64"
+
+container-single:
+  extends:
+    - .container-build-tmpl
+  when:
+    manual
+
+container-all:
+  extends:
+    - .container-build-tmpl
+  when:
+    manual
+  variables:
+    CONTAINER: "all"