lcitool/manifest: split gitlab container jobs into separate file

Currently ci/gitlab.yml contains all the generated build logic.

This continues from the previous commit by splitting the container
jobs into a separate file called 'ci/gitlab/containers.yml'

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

4 files changed, 47 insertions, 42 deletions

diff --git a/guests/lcitool/lcitool/manifest.py b/guests/lcitool/lcitool/manifest.py
index f264366..da38f53 100644
--- a/guests/lcitool/lcitool/manifest.py
+++ b/guests/lcitool/lcitool/manifest.py
@@ -310,8 +310,13 @@ class Manifest:
         includes.append(path)
 
         if gitlabinfo["containers"]:
-            gitlabcontent.extend(self._generate_gitlab_native_container_jobs())
-            gitlabcontent.extend(self._generate_gitlab_cross_container_jobs())
+            path = Path(gitlabdir, "containers.yml")
+            content = []
+            content.extend(self._generate_gitlab_native_container_jobs())
+            content.extend(self._generate_gitlab_cross_container_jobs())
+            self._replace_file(content, path, dryrun)
+            includes.append(path)
+
         if gitlabinfo["builds"]:
             gitlabcontent.extend(self._generate_gitlab_native_build_jobs())
             gitlabcontent.extend(self._generate_gitlab_cross_build_jobs())
diff --git a/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml b/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml
index ea90c2a..9e850a2 100644
--- a/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml
+++ b/guests/lcitool/tests/data/manifest/out/ci/gitlab.yml
@@ -2,46 +2,7 @@ include:
   - local: 'ci/gitlab/container-templates.yml'
   - local: 'ci/gitlab/build-templates.yml'
   - local: 'ci/gitlab/sanity-checks.yml'
-
-# Native container jobs
-
-x86_64-centos-stream-9-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: centos-stream-9
-
-
-x86_64-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-rawhide
-
-
-
-# Cross container jobs
-
-i686-debian-sid-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-sid-cross-i686
-
-
-ppc64le-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-ppc64le
-
-
-mingw32-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-rawhide-cross-mingw32
-
+  - local: 'ci/gitlab/containers.yml'
 
 # Native build jobs
 
diff --git a/guests/lcitool/tests/data/manifest/out/ci/gitlab/containers.yml b/guests/lcitool/tests/data/manifest/out/ci/gitlab/containers.yml
new file mode 100644
index 0000000..649d208
--- /dev/null
+++ b/guests/lcitool/tests/data/manifest/out/ci/gitlab/containers.yml
@@ -0,0 +1,38 @@
+# Native container jobs
+
+x86_64-centos-stream-9-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: centos-stream-9
+
+
+x86_64-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-rawhide
+
+
+
+# Cross container jobs
+
+i686-debian-sid-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: debian-sid-cross-i686
+
+
+ppc64le-debian-sid-container:
+  extends: .container_job
+  allow_failure: true
+  variables:
+    NAME: debian-sid-cross-ppc64le
+
+
+mingw32-fedora-rawhide-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-rawhide-cross-mingw32
diff --git a/guests/lcitool/tests/test_manifest.py b/guests/lcitool/tests/test_manifest.py
index 14ab884..81dd2a5 100644
--- a/guests/lcitool/tests/test_manifest.py
+++ b/guests/lcitool/tests/test_manifest.py
@@ -115,6 +115,7 @@ def test_generate(monkeypatch, custom_projects):
         # Verify content of files we expect to be created
         assert_write(Path("ci", "gitlab.yml"))
         assert_write(Path("ci", "gitlab", "container-templates.yml"))
+        assert_write(Path("ci", "gitlab", "containers.yml"))
         assert_write(Path("ci", "gitlab", "build-templates.yml"))
         assert_write(Path("ci", "gitlab", "sanity-checks.yml"))
         assert_write(Path("ci", "cirrus", "freebsd-current.vars"))