imgtestlib: set global CI_RUNNER

Set the common CI runner as a global constant in imgtestlib and use it in all gitlab CI generators.
osbuild · Nov 22, 2024 · 4a8d742 · 4a8d742
1 parent 75ecd24
commit 4a8d742
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/test/scripts/generate-build-config b/test/scripts/generate-build-config
@@ -18,7 +18,7 @@ build/{distro}/{arch}/{image_type}/{config_name}:
     - ./test/scripts/upload-results "{distro}" "{image_type}" "{config}"
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "{internal}"
 """
 
@@ -66,6 +66,7 @@ def generate_configs(build_requests, pipeline_file):
 
         config_path = os.path.join(testlib.CONFIGS_PATH, config_name+".json")
         pipeline_file.write(JOB_TEMPLATE.format(distro=distro, arch=arch, image_type=image_type,
+                                                runner=testlib.CI_RUNNER,
                                                 config_name=config_name, config=config_path,
                                                 internal="true" if "rhel" in distro else "false",
                                                 image_path=image_path))

diff --git a/test/scripts/generate-gitlab-ci b/test/scripts/generate-gitlab-ci
@@ -7,6 +7,7 @@ import imgtestlib as testlib
 
 ARCHITECTURES = ["x86_64", "aarch64"]
 MANIFEST_ONLY_ARCHES = ["ppc64le", "s390x"]
+RUNNER = testlib.CI_RUNNER
 
 
 BASE_CONFIG = """---
@@ -36,7 +37,7 @@ check-build-coverage:
   stage: verify
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: {runner}-x86_64
     INTERNAL_NETWORK: "true"
     PYTHONUNBUFFERED: 1
   script:
@@ -70,7 +71,7 @@ generate-build-config-{distro}-{arch}:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -102,7 +103,7 @@ generate-ostree-build-config-{distro}-{arch}:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -138,7 +139,7 @@ generate-manifests-{distro}-{arch}:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-x86_64
+    RUNNER: {runner}-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -175,10 +176,29 @@ def main():
             continue
 
         combos.add(combo)
-        gen_stage.append(GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
-        trigger_stage.append(TRIGGER_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
-        ostree_gen_stage.append(OSTREE_GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
-        ostree_trigger_stage.append(OSTREE_TRIGGER_TEMPLATE.format(distro=img["distro"], arch=img["arch"], cache=cache))
+        gen_stage.append(GEN_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
+
+        trigger_stage.append(TRIGGER_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
+
+        ostree_gen_stage.append(OSTREE_GEN_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
+
+        ostree_trigger_stage.append(OSTREE_TRIGGER_TEMPLATE.format(
+            distro=img["distro"],
+            arch=img["arch"],
+            runner=RUNNER,
+            cache=cache))
 
     man_only_images = testlib.list_images(arches=MANIFEST_ONLY_ARCHES)
     man_gen_stage = []
@@ -188,10 +208,10 @@ def main():
             continue
 
         combos.add(combo)
-        man_gen_stage.append(MANIFEST_GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"]))
+        man_gen_stage.append(MANIFEST_GEN_TEMPLATE.format(distro=img["distro"], arch=img["arch"], runner=RUNNER))
 
     with open(config_path, "w", encoding="utf-8") as config_file:
-        config_file.write(BASE_CONFIG)
+        config_file.write(BASE_CONFIG.format(runner=RUNNER))
         config_file.write(testlib.BASE_CONFIG)
         config_file.write("\n".join(gen_stage))
         config_file.write("\n".join(trigger_stage))

diff --git a/test/scripts/generate-ostree-build-config b/test/scripts/generate-ostree-build-config
@@ -20,7 +20,7 @@ build/{distro}/{arch}/{image_type}/{config_name}:
     - ./test/scripts/upload-results "{distro}" "{image_type}" "{config}"
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-40-{arch}
+    RUNNER: {runner}-{arch}
     INTERNAL_NETWORK: "{internal}"
   needs:
     - pipeline: "$PARENT_PIPELINE_ID"
@@ -312,6 +312,7 @@ def generate_configs(build_requests, container_configs, pipeline_file, configs_d
         run_container_cmd = f"sudo podman run -d --rm -p{container_port}:8080 oci-archive:container.tar"
 
         pipeline_file.write(JOB_TEMPLATE.format(distro=distro, arch=arch, image_type=image_type,
+                                                runner=testlib.CI_RUNNER,
                                                 config_name=config_name, config=build_config_path,
                                                 dl_container=dl_container_cmd,
                                                 start_container=run_container_cmd,

diff --git a/test/scripts/imgtestlib.py b/test/scripts/imgtestlib.py
@@ -18,6 +18,11 @@
 SCHUTZFILE = "Schutzfile"
 OS_RELEASE_FILE = "/etc/os-release"
 
+# CI runner for common tasks.
+# Currently this is used for all gitlab CI jobs. In the future, we might switch to running build jobs on the same host
+# distro as the target image, but this CI runner will still be used for generic tasks like check-build-coverage.
+CI_RUNNER = "aws/fedora-40"
+
 # image types that can be boot tested
 CAN_BOOT_TEST = [
     "ami",