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




commit 770e98b2dd46ce5fc229c600cdafc8bea5b4c274
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/lib/gnomeutils.pm        | 30 ------------------------------
 openqa/main.pm                  | 11 -----------
 openqa/tests/app_settings.pm    | 16 ----------------
 openqa/tests/gnome_desktop.pm   | 15 ---------------
 openqa/tests/gnome_install.pm   | 20 --------------------
 openqa/tests/gnome_welcome.pm   | 30 ------------------------------
 openqa/utils/setup_worker.sh    | 35 -----------------------------------
 openqa/utils/start_job.sh       | 22 ----------------------
 openqa/utils/teardown_worker.sh | 10 ----------
 openqa/utils/wait_for_job.sh    | 29 -----------------------------
 12 files changed, 7 insertions(+), 219 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d8010b49..26acd4dd4 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
 
   # Docker Images
   DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
@@ -458,6 +460,8 @@ test-iso-installer-x86_64:
   - job: 'iso-installer-x86_64'
     artifacts: true
   script:
+  - |
+    git clone "$OPENQA_TESTS_GIT" --branch "$OPENQA_TESTS_BRANCH" ./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>


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