[gnome-build-meta/sthursfield/james/openqa-master: 11/21] openqa: Run only on 'master' branch




commit e420bc5e66c6bab236b0c6fb07374a94e78f431a
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Jul 29 18:46:59 2021 +0200

    openqa: Run only on 'master' branch
    
    Each branch that we want to test requires manual configuration on
    the OpenQA server as a new 'Job group'. Limit to master for now and we
    can manually add stable branches as needed.

 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25ab345a..4b678ad9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -295,7 +295,10 @@ test-iso-installer-x86_64:
     # For now, using a version built locally, from openQA.git commit ceabc2be82e1f1c6c3c51bf017c1b79494ace869
     name: quay.io/ssssam/openqa_worker
     entrypoint: [ "/bin/bash", "-c" ]
-  when: manual
+  rules:
+  - if: $CI_COMMIT_REF_NAME == "master"
+    when: always
+  - when: manual
   variables:
     IMAGE: iso/image.bst
     # CI needs to be set so OPENQA_TEST_TIMEOUT_SCALE_CI has an effect.
@@ -347,7 +350,7 @@ test-iso-installer-x86_64:
       -X POST isos \
       ISO=installer.iso \
       DISTRI=gnomeos \
-      VERSION=master \
+      VERSION=${CI_COMMIT_REF_NAME} \
       FLAVOR=dvd \
       ARCH=x86_64 \
       WORKER_CLASS=$worker_class \
@@ -513,4 +516,4 @@ pages:
     paths:
     - 'public'
   rules:
-  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d\d$/
\ No newline at end of file
+  - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d\d$/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]