[gnome-build-meta/sam/openqa-separate-repo: 15/15] openqa: Move tests into separate repository
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/sam/openqa-separate-repo: 15/15] openqa: Move tests into separate repository
- Date: Fri, 7 Oct 2022 09:59:05 +0000 (UTC)
commit c8e2fa824d1d79f711b23959e03d9cfbbf021040
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.
Requires https://gitlab.gnome.org/GNOME/openqa-tests/-/merge_requests/3
.gitlab-ci.yml | 9 +++++++--
openqa/README.md => README.openqa | 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, 9 insertions(+), 220 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ec172415..3d082c51b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,10 @@ variables:
BST: "bst --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"
@@ -421,6 +423,9 @@ test-iso-installer-x86_64:
- job: 'iso-installer-x86_64'
artifacts: true
script:
+ - |
+ git clone "$OPENQA_TESTS_GIT" --branch "$OPENQA_TESTS_BRANCH" ./openqa
+ echo "Checked out $OPENQA_TESTS_GIT commit $(git -C ./openqa rev-parse HEAD)"
- |
mkdir -p /data/factory/iso/
ln -s $(pwd)/image/installer.iso /data/factory/iso/installer.iso
@@ -436,7 +441,7 @@ test-iso-installer-x86_64:
openqa/utils/setup_worker.sh ${worker_class} > /tmp/machine_id
/run_openqa_worker.sh &> worker.log &
- |
- openqa/utils/start_job.sh ${worker_class} master > /tmp/job_id
+ openqa/utils/start_job.sh ${worker_class} master "$(pwd)/openqa" > /tmp/job_id
echo "Test job has been started, visit $OPENQA_HOST/tests/$(cat /tmp/job_id) to see the progress"
- openqa/utils/wait_for_job.sh $(cat /tmp/job_id) > /tmp/exit_code
- exit $(cat /tmp/exit_code)
diff --git a/openqa/README.md b/README.openqa
similarity index 72%
rename from openqa/README.md
rename to README.openqa
index a8a6ae784..8bc4683e7 100644
--- a/openqa/README.md
+++ b/README.openqa
@@ -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]