[gnome-build-meta/cfoch/openqa_templates: 10/10] workaround: Just to make the job to run




commit 42c3d7f3f5baeffe9e6366004a8638320e812319
Author: Fabian Orccon <cfoch fabian gmail com>
Date:   Tue Oct 26 15:12:24 2021 +0200

    workaround: Just to make the job to run

 .gitlab-ci.yml               |  9 ++-------
 openqa/utils/setup_worker.sh | 15 ---------------
 2 files changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1218fffb..c5fbc820c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -448,7 +448,7 @@ test-iso-installer-x86_64:
     openqa/templates --host $OPENQA_HOST --update
   - |
     worker_class=qemu_x86_64
-    openqa/utils/setup_worker.sh ${worker_class} > /tmp/machine_id
+    openqa/utils/setup_worker.sh ${worker_class}
     /run_openqa_worker.sh &> worker.log &
   - |
     openqa/utils/start_job.sh ${worker_class} master > /tmp/job_id
@@ -457,12 +457,7 @@ test-iso-installer-x86_64:
   - exit $(cat /tmp/exit_code)
   after_script:
   - |
-    if [ -e /tmp/machine_id ]; then
-        echo "Cleaning up worker"
-        openqa/utils/teardown_worker.sh $(cat /tmp/machine_id)
-        rm /tmp/machine_id
-    fi
-  - if [ ! -e /tmp/exit_code ]; then
+    if [ ! -e /tmp/exit_code ]; then
         echo "Job creation failed, log below."
         cat openqa.log
   - fi
diff --git a/openqa/utils/setup_worker.sh b/openqa/utils/setup_worker.sh
index 1678c66c6..103d7a367 100755
--- a/openqa/utils/setup_worker.sh
+++ b/openqa/utils/setup_worker.sh
@@ -18,18 +18,3 @@ BACKEND = qemu
 HOST = $OPENQA_HOST
 EOF
 
-# Register local worker as a new machine on OpenQA server.
-openqa-cli api --apikey $OPENQA_API_KEY --apisecret $OPENQA_API_SECRET \
-  --host $OPENQA_HOST \
-  -X POST machines/ \
-  name=gitlab-runner-$worker_class \
-  backend=qemu \
-  settings[ARCH]=x86_64 \
-  settings[PART_TABLE_TYPE]=gpt \
-  settings[QEMUCPU]=host \
-  settings[QEMUCPUS]=2 \
-  settings[QEMURAM]=2560 \
-  settings[QEMUVGA]=virtio \
-  settings[UEFI]=1 \
-  settings[UEFI_PFLASH_CODE]=/usr/share/qemu/ovmf-x86_64-code.bin \
-  settings[WORKER_CLASS]=$worker_class | tee --append openqa.log | jq -e .id > /tmp/machine_id


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