From a0e069cfad5d99a745245416aeedb8ea129fad74 Mon Sep 17 00:00:00 2001
From: akatch <akatch@users.noreply.github.com>
Date: Wed, 24 Nov 2021 15:53:07 -0600
Subject: [PATCH] [openqa] Update ISO URL and checksums for 8.5 (#15000)

* Increment minor version

* Update checksums and version for 8.5

* Add tags and document additional workflows for openQA developer hosts
---
 .../init-rocky-openqa-developer-host.yml      | 12 +++++++
 ansible/playbooks/tasks/openqa.yml            | 32 ++++++++++++++++++-
 ansible/playbooks/vars/openqa.yml             | 10 +++---
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ansible/playbooks/init-rocky-openqa-developer-host.yml b/ansible/playbooks/init-rocky-openqa-developer-host.yml
index bbe037b..f462e9b 100644
--- a/ansible/playbooks/init-rocky-openqa-developer-host.yml
+++ b/ansible/playbooks/init-rocky-openqa-developer-host.yml
@@ -1,5 +1,17 @@
 # Sets up local OpenQA testing environment
 # This playbook is *NOT* intended for WAN-facing systems!
+#
+# Usages:
+#   # Install and configure an openQA developer host, download all current Rocky ISOs,
+#   # and POST a test job
+#   ansible-playbook playbooks/init-rocky-openqa-developer-host.yml
+#
+#   # Only perform ISO download tasks
+#   ansible-playbook playbooks/init-rocky-openqa-developer-host.yml --tags=download_isos
+#
+#   # Only perform configuration, do not download ISOs or POST a job
+#   ansible-playbook playbooks/init-rocky-openqa-developer-host.yml --tags=configure
+#
 # Created: @akatch
 ---
 - name: Rocky OpenQA Runbook
diff --git a/ansible/playbooks/tasks/openqa.yml b/ansible/playbooks/tasks/openqa.yml
index 51d5402..27d3585 100644
--- a/ansible/playbooks/tasks/openqa.yml
+++ b/ansible/playbooks/tasks/openqa.yml
@@ -3,6 +3,8 @@
   yum:
     name: "{{ openqa_packages }}"
     state: present
+  tags:
+    - packages
 
 - name: Copy httpd configuration files
   copy:
@@ -16,6 +18,8 @@
     - openqa.conf
     - openqa-ssl.conf
   notify: restart_httpd
+  tags:
+    - configure
 
 - name: Template OpenQA configuration files
   template:
@@ -27,6 +31,8 @@
   loop:
     - openqa.ini
     - client.conf
+  tags:
+    - configure
 
 - name: Get service facts
   service_facts:
@@ -54,6 +60,8 @@
     name: httpd_can_network_connect
     state: true
     persistent: true
+  tags:
+    - configure
 
 - name: Enable and start OpenQA services
   systemd:
@@ -61,6 +69,8 @@
     state: started
     enabled: true
   loop: "{{ openqa_services }}"
+  tags:
+    - configure
 
 - name: Create openqa-vnc firewalld service
   template:
@@ -69,11 +79,15 @@
     owner: root
     group: root
     mode: "0644"
+  tags:
+    - configure
 
 - name: Load openqa-vnc firewalld service
   systemd:
     name: firewalld
     state: reloaded
+  tags:
+    - configure
 
 - name: Permit traffic for {{ item }} service
   ansible.posix.firewalld:
@@ -83,16 +97,22 @@
   loop:
     - http
     - openqa-vnc
+  tags:
+    - configure
 
 - name: Reload FirewallD
   systemd:
     name: firewalld
     state: reloaded
+  tags:
+    - configure
 
 - name: Check for existing repository
   stat:
     path: "{{ openqa_homedir }}/share/tests/rocky"
   register: rocky_testing_repo
+  tags:
+    - configure
 
 - name: Clone repository if it does not already exist
   git:
@@ -101,6 +121,8 @@
     repo: "{{ openqa_rocky_testing_repo }}"
     version: develop
   when: not rocky_testing_repo.stat.exists
+  tags:
+    - configure
 
 - name: Set owner/group/permissions on repo contents
   file:
@@ -109,6 +131,8 @@
     owner: "{{ openqa_user }}"
     group: "{{ openqa_group }}"
     mode: "u+rwX,g+rwX,o+rX,o-w"
+  tags:
+    - configure
 
 # fifloader.py will fail if the Demo user is not logged in
 - name: Authenticate to web UI the first time
@@ -128,6 +152,8 @@
     owner: "{{ openqa_user }}"
     group: "{{ openqa_group }}"
     mode: "0775"
+  tags:
+    - download_isos
 
 - name: Download ISOs
   get_url:
@@ -139,6 +165,8 @@
     tmp_dest: "/var/tmp"
     mode: "0644"
   loop: "{{ openqa_isos }}"
+  tags:
+    - download_isos
 
 - name: Start {{ openqa_worker_count }} OpenQA workers
   ansible.builtin.systemd:
@@ -147,7 +175,9 @@
     enabled: true
   # range 'end' parameter is exclusive, so add 1
   loop: "{{ range(1, (openqa_worker_count|int + 1)) | list }}"
-  tags: start_workers
+  tags:
+    - start_workers
+    - configure
 
 - name: POST a job
   command: |
diff --git a/ansible/playbooks/vars/openqa.yml b/ansible/playbooks/vars/openqa.yml
index 6f4b089..b11e90b 100644
--- a/ansible/playbooks/vars/openqa.yml
+++ b/ansible/playbooks/vars/openqa.yml
@@ -10,22 +10,22 @@ openqa_homedir: /var/lib/openqa
 openqa_rocky_testing_repo: "https://github.com/rocky-linux/os-autoinst-distri-rocky.git"
 
 # The RockyLinux version to fetch for testing
-rocky_version: 8.4
+rocky_version: 8.5
 
 # The RockyLinux architecture to fetch for testing
 rocky_arch: x86_64
 
 # Public download URL for RockyLinux ISOs
-rocky_iso_download_url: "https://download.rockylinux.org/pub/rocky/8/isos/{{ rocky_arch }}"
+rocky_iso_download_url: "https://download.rockylinux.org/pub/rocky/8.5/isos/{{ rocky_arch }}"
 
 # Rocky Linux ISOs
 openqa_isos:
   - name: "Rocky-{{ rocky_version }}-{{ rocky_arch }}-boot.iso"
-    checksum: "sha256:53a62a72881b931bdad6b13bcece7c3a2d4ca9c4a2f1e1a8029d081dd25ea61f"
+    checksum: "sha256:5a0dc65d1308e47b51a49e23f1030b5ee0f0ece3702483a8a6554382e893333c"
   - name: "Rocky-{{ rocky_version }}-{{ rocky_arch }}-dvd1.iso"
-    checksum: "sha256:ffe2fae67da6702d859cfb0b321561a5d616ce87a963d8a25b018c9c3d52d9a4"
+    checksum: "sha256:0081f8b969d0cef426530f6d618b962c7a01e71eb12a40581a83241f22dfdc25"
   - name: "Rocky-{{ rocky_version }}-{{ rocky_arch }}-minimal.iso"
-    checksum: "sha256:0de5f12eba93e00fefc06cdb0aa4389a0972a4212977362ea18bde46a1a1aa4f"
+    checksum: "sha256:4eb2ae6b06876205f2209e4504110fe4115b37540c21ecfbbc0ebc11084cb779"
 
 # The host the openqa-cli should access when it runs.
 # Change this if you want to access your OpenQA via an