[openqa-tests/sam/upstream-container] Move all machine config into `POST isos/` call

[Sam Thursfield <sthursfield src gnome org>]

commit ede31ed15fc011220ae0206fff2d44890461e04d
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Thu Oct 6 15:59:24 2022 +0200

    Move all machine config into `POST isos/` call
    
    Setting the config the call to `POST machines/` is not useful.
    The config is set up correctly on the new machine. But the tests
    run against the machine `qemu_x86_64` that's predefined on
    openqa.gnome.org.
    
    We should have config in Git as much as possible, so, I have removed
    as much as possible from the predefined `qemu_x86_64` machine and
    hopefully we can pass it on calling `POST isos/`. The docs certainly
    suggest this is possible: http://open.qa/docs/#_variable_precedence

 utils/setup_worker.sh |  9 ---------
 utils/start_job.sh    | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/utils/setup_worker.sh b/utils/setup_worker.sh
index c4491b8..664c6a5 100755
--- a/utils/setup_worker.sh
+++ b/utils/setup_worker.sh
@@ -24,13 +24,4 @@ openqa-cli api --apikey $OPENQA_API_KEY --apisecret $OPENQA_API_SECRET \
   -X POST machines/ \
   name=gitlab-runner-$worker_class \
   backend=qemu \
-  settings[ARCH]=x86_64 \
-  settings[PART_TABLE_TYPE]=gpt \
-  settings[QEMU_APPEND]="display egl-headless,gl=on" \
-  settings[QEMUCPU]=host \
-  settings[QEMUCPUS]=2 \
-  settings[QEMURAM]=2560 \
-  settings[QEMU_VIDEO_DEVICE]="virtio-gpu-gl-pci,edid=on,max_outputs=1" \
-  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
diff --git a/utils/start_job.sh b/utils/start_job.sh
index 5034a5f..886a2bb 100755
--- a/utils/start_job.sh
+++ b/utils/start_job.sh
@@ -12,11 +12,20 @@ version=$2
 openqa-cli api --apikey $OPENQA_API_KEY --apisecret $OPENQA_API_SECRET \
   --host $OPENQA_HOST \
   -X POST isos \
-  ISO=installer.iso \
+  ARCH=x86_64 \
+  CASEDIR=$(pwd) \
   DISTRI=gnomeos \
-  VERSION=$version \
   FLAVOR=iso \
-  ARCH=x86_64 \
+  ISO=installer.iso \
+  NEEDLES_DIR=$OPENQA_NEEDLES_GIT#$OPENQA_NEEDLES_BRANCH \
+  PART_TABLE_TYPE=gpt \
+  QEMUCPU=host \
+  QEMUCPUS=2 \
+  QEMURAM=2560 \
+  QEMU_APPEND="display egl-headless,gl=on" \
+  QEMU_VIDEO_DEVICE="virtio-gpu-gl-pci,edid=on,max_outputs=1" \
+  UEFI=1 \
+  UEFI_PFLASH_CODE=/usr/share/qemu/ovmf-x86_64-code.bin \
+  VERSION=$version \
   WORKER_CLASS=$worker_class \
-  CASEDIR=$(pwd) \
-  NEEDLES_DIR=$OPENQA_NEEDLES_GIT#$OPENQA_NEEDLES_BRANCH | tee --append openqa.log | jq -e .ids[0]
+  | tee --append openqa.log | jq -e .ids[0]