Repository: osbuild/osbuild-composer
Pull request #1849 (2021-09-29 18:40:01)

ci: don't run nightly pipeline on ga releases
It makes no sesnse to run nightly testing on ga composes. This updates
the regex to exclude ga runners from the scheduled nightly run.


This pull request includes:

- [ ] adequate testing for the new functionality or fixed issue
- [ ] adequate documentation informing people about the change such as
  - [ ] create a file in [news/unreleased](https://github.com/osbuild/osbuild-composer/tree/main/docs/news/unreleased) directory if this change should be mentioned in the release news
  - [ ] submit a PR for the [guides](https://github.com/osbuild/guides) repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

<!--
Thanks for proposing a change to osbuild-composer!

Please don't remove the above check list. These are things that each pull
request must have before it is merged. It helps maintainers to not forget
anything.

If the reason for ticking any of the boxes is ambiguous, please add a short
note explaining why.

For user-visible changes, "adequate documentation" is an entry describing the
change for users in docs/news. Please refer to docs/news/README.md for details.

In addition, if this pull request fixes a downstream issue, please refer to
test/README.md and add these additional items:

- [ ] 1st commit of any `rhbz#` related PR contains bug reproducer; CI reports FAIL or
- [ ] PR contains automated tests for new functionality and
- [ ] QE has approved reproducer/new tests and
- [ ] Subsequent commits provide bug fixes without modifying the reproducer; CI reports PASS and
- [ ] QE approves this PR; RHBZ status is set to `MODIFIED + Verified=Tested`
-->



Patch:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95a39ec66..08f4f332e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ Base:
   extends: .terraform
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/base_tests.sh
@@ -136,7 +136,7 @@ Regression:
   extends: .terraform
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/regression.sh
@@ -167,7 +167,7 @@ OSTree:
   extends: .terraform/openstack
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/ostree.sh
@@ -239,7 +239,7 @@ Integration:
   extends: .terraform
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/${SCRIPT}
@@ -287,7 +287,7 @@ API:
   extends: .terraform
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/api.sh ${TARGET}
@@ -318,7 +318,7 @@ libvirt:
   extends: .terraform/openstack
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/libvirt.sh
@@ -370,7 +370,7 @@ Installer:
   extends: .terraform/openstack
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[\S]+/ && $NIGHTLY == "true"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-[8-9]\.[0-9]-[^ga][\S]+/ && $NIGHTLY == "true"'
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/installers.sh
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index 997363ddb..7934257a8 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel90/pipelines.go
@@ -53,7 +53,7 @@ func qcow2Pipelines(t *imageType, customizations *blueprint.Customizations, opti
 	imagePipeline := liveImagePipeline(treePipeline.Name, diskfile, &partitionTable, t.arch, kernelVer)
 	pipelines = append(pipelines, *imagePipeline)
 
-	qemuPipeline := qemuPipeline(imagePipeline.Name, diskfile, t.filename, "qcow2", "0.10")
+	qemuPipeline := qemuPipeline(imagePipeline.Name, diskfile, t.filename, "qcow2", "1.1")
 	pipelines = append(pipelines, *qemuPipeline)
 
 	return pipelines, nil
diff --git a/tools/clouddot_build_deploy.sh b/tools/appsre-build-deploy.sh
similarity index 91%
rename from tools/clouddot_build_deploy.sh
rename to tools/appsre-build-deploy.sh
index b6dae6a0c..a01c83a31 100755
--- a/tools/clouddot_build_deploy.sh
+++ b/tools/appsre-build-deploy.sh
@@ -2,7 +2,7 @@
 # AppSRE runs this script to build the container and push it to Quay.
 set -exv
 
-IMAGE_NAME="quay.io/cloudservices/osbuild-composer"
+IMAGE_NAME="quay.io/app-sre/composer"
 IMAGE_TAG=$(git rev-parse --short=7 HEAD)
 
 if [[ -z "$QUAY_USER" || -z "$QUAY_TOKEN" ]]; then


Test patch:
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
index 91477cdbe..78fd10911 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
@@ -1080,7 +1080,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-customize.json b/test/data/manifests/rhel_90-aarch64-qcow2-customize.json
index 8ce32053a..049ec814c 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2-customize.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2-customize.json
@@ -1415,7 +1415,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
index e7c902785..f6d1ba1bc 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
@@ -1120,7 +1120,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json b/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json
index f0a0ae84a..21573357d 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json
@@ -1461,7 +1461,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
index e554f1b28..98fdc8d7b 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
@@ -1214,7 +1214,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-s390x-qcow2-customize.json b/test/data/manifests/rhel_90-s390x-qcow2-customize.json
index fb82b1990..f315ae167 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2-customize.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2-customize.json
@@ -1539,7 +1539,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
index 80594e241..9be4f6a7b 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
@@ -1132,7 +1132,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-customize.json b/test/data/manifests/rhel_90-x86_64-qcow2-customize.json
index c161c8e03..7e4ff18cd 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2-customize.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2-customize.json
@@ -1484,7 +1484,7 @@
               "filename": "disk.qcow2",
               "format": {
                 "type": "qcow2",
-                "compat": "0.10"
+                "compat": "1.1"
               }
             }
           }