[gnome-build-meta/sam/openqa-separate-repo: 6/6] openqa: Move tests into separate repository




commit 2fc7dad161b8a348f2b17d3f2f8f1f904014dbf0
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Tue Nov 9 11:40:49 2021 +0100

    openqa: Move tests into separate repository
    
    See https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/453 for
    rationale.

 .gitlab-ci.yml                |  6 +++++-
 openqa/README.md              |  2 ++
 openqa/main.pm                |  9 ---------
 openqa/tests/gnome_desktop.pm | 15 ---------------
 openqa/tests/gnome_install.pm | 20 --------------------
 openqa/tests/gnome_welcome.pm | 30 ------------------------------
 openqa/utils/start_job.sh     |  4 ++--
 7 files changed, 9 insertions(+), 77 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7178e515..6dac022b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,10 @@ variables:
   BST: "bst $BST_STRICT --config .gitlab-ci/buildstream.conf --log-file logs/build.log --colors"
   FLATPAK_BRANCH: master
   OPENQA_HOST: https://openqa.gnome.org
+  OPENQA_TESTS_GIT: https://gitlab.gnome.org/gnome/openqa-tests
+  OPENQA_TESTS_BRANCH: master
   OPENQA_NEEDLES_GIT: https://gitlab.gnome.org/gnome/openqa-needles
-  OPENQA_NEEDLES_SHA: master
+  OPENQA_NEEDLES_BRANCH: master
 
 stages:
 - track
@@ -428,6 +430,8 @@ test-iso-installer-x86_64:
   - job: 'iso-installer-x86_64'
     artifacts: true
   script:
+  - |
+    git clone https://gitlab.gnome.org/gnome/openqa-tests -o ./openqa
   - |
     mkdir -p /data/factory/iso/
     ln -s $(pwd)/image/installer.iso /data/factory/iso/installer.iso
diff --git a/openqa/README.md b/openqa/README.md
index a8a6ae784..8bc4683e7 100644
--- a/openqa/README.md
+++ b/openqa/README.md
@@ -2,5 +2,7 @@
 
 GNOME has an OpenQA instance here: <https://openqa.gnome.org/>
 
+The tests live in a separate repo: <https://gitlab.gnome.org/GNOME/openqa-tests>
+
 Documentation can be found here:
 <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/wikis/openqa/OpenQA-for-GNOME-developers>
diff --git a/openqa/utils/start_job.sh b/openqa/utils/start_job.sh
index 05c72293a..9b21b06b9 100755
--- a/openqa/utils/start_job.sh
+++ b/openqa/utils/start_job.sh
@@ -18,5 +18,5 @@ openqa-cli api --apikey $OPENQA_API_KEY --apisecret $OPENQA_API_SECRET \
   FLAVOR=iso \
   ARCH=x86_64 \
   WORKER_CLASS=$worker_class \
-  CASEDIR=$(pwd)/openqa \
-  NEEDLES_DIR=$OPENQA_NEEDLES_GIT#$OPENQA_NEEDLES_SHA | tee --append openqa.log | jq -e .ids[0]
+  CASEDIR=$OPENQA_TESTS_GIT#$OPENQA_TESTS_BRANCH \
+  NEEDLES_DIR=$OPENQA_NEEDLES_GIT#$OPENQA_NEEDLES_BRANCH | tee --append openqa.log | jq -e .ids[0]


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