canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+483567@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging qa-jenkins-jobs:rf-jobs-update into qa-jenkins-jobs:master.

Requested reviews:
  Canonical Platform QA Team (canonical-platform-qa)

For more details, see:
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/+git/qa-jenkins-jobs/+merge/483567

Couple fixups:
- install ffmpeg
- allow cloning specific branch of RF 
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of qa-jenkins-jobs:rf-jobs-update into qa-jenkins-jobs:master.

diff --git a/jobs/robot-framework-iso-testing/jobs.yaml b/jobs/robot-framework-iso-testing/jobs.yaml
index f65f749..b89295a 100644
--- a/jobs/robot-framework-iso-testing/jobs.yaml
+++ b/jobs/robot-framework-iso-testing/jobs.yaml
@@ -37,6 +37,10 @@
           name: HIT_BRANCH
           default: 'main'
           description: branch of HIT to run tests from
+      - string:
+          name: RF_BRANCH
+          default: 'main'
+          description: branch of RF to run tests from
     triggers:
         - pollurl:
             cron: '@hourly'
@@ -77,8 +81,8 @@
                 retry -d 60 -t 5 -- wget -nv -c "$ISO_URL"
                 # clone HIT and yarf
                 retry -t 3 -d 180 -- git clone -b "$HIT_BRANCH" https://oauth2:"$GH_PAT"@github.com/canonical/hardware-installer-testing.git
-                retry -t 3 -d 180 -- git clone -b main https://oauth2:"$GH_PAT"@github.com/canonical/yarf.git
-                DEBIAN_FRONTEND=noninteractive sudo apt-get install -y clang libxkbcommon-dev tesseract-ocr
+                retry -t 3 -d 180 -- git clone -b "$RF_BRANCH" https://oauth2:"$GH_PAT"@github.com/canonical/yarf.git
+                sudo DEBIAN_FRONTEND=noninteractive apt-get install -qy clang libxkbcommon-dev tesseract-ocr ffmpeg
                 cd yarf/
                 sudo snap install astral-uv --classic
                 # set up venv