From d74a7a7e0a40695c288994188a902510916875d0 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 25 Jul 2024 15:55:44 -0600 Subject: [PATCH 01/23] Updated tasks per linter with fqcn --- roles/builder/tasks/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/builder/tasks/main.yml b/roles/builder/tasks/main.yml index 346811ac..3c59bdb9 100644 --- a/roles/builder/tasks/main.yml +++ b/roles/builder/tasks/main.yml @@ -101,25 +101,27 @@ - block: - name: Copy the blueprint file - copy: + ansible.builtin.copy: src: "{{ builder_blueprint_import_file }}" dest: "{{ builder_blueprint_src_path }}" ## TODO: Check the imported file TOML format - name: Read the content of the TOML file - slurp: + ansible.builtin.slurp: src: "{{ builder_blueprint_src_path }}" register: toml_file_content - name: Parse TOML content - shell: "echo '{{ toml_file_content.content | b64decode }}' | python -c 'import sys, toml; print(toml.loads(sys.stdin.read())[\"version\"])'" + ansible.builtin.shell: | + set -o pipefail + echo '{{ toml_file_content.content | b64decode }}' | python -c 'import sys, toml; print(toml.loads(sys.stdin.read())[\"version\"])' register: _imported_blueprint_version - name: Set blueprint name in the imported TOML file - shell: "sed -i '0,/name =/ s/name =.*/name = \"{{ builder_blueprint_name }}\"/' {{ builder_blueprint_src_path }}" + ansible.builtin.shell: "sed -i '0,/name =/ s/name =.*/name = \"{{ builder_blueprint_name }}\"/' {{ builder_blueprint_src_path }}" - name: Set expected var output with current_version from TOML - set_fact: + ansible.builtin.set_fact: builder_blueprint_output: msg: "Blueprint file written to location: {{ builder_blueprint_src_path }}" changed: true From 34aa964947eac0f41b54d41e173d24f5ea39e345 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Tue, 27 Aug 2024 08:18:33 -0600 Subject: [PATCH 02/23] Updated several tasks to resolve lint issues --- roles/builder/tasks/main.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/roles/builder/tasks/main.yml b/roles/builder/tasks/main.yml index 3c59bdb9..0622b8a9 100644 --- a/roles/builder/tasks/main.yml +++ b/roles/builder/tasks/main.yml @@ -99,11 +99,14 @@ register: builder_blueprint_output when: builder_blueprint_import_file is not defined - - block: + - name: Create a blueprint TOML Tasks Block + when: builder_blueprint_import_file is defined + block: - name: Copy the blueprint file ansible.builtin.copy: src: "{{ builder_blueprint_import_file }}" dest: "{{ builder_blueprint_src_path }}" + mode: '0644' ## TODO: Check the imported file TOML format - name: Read the content of the TOML file @@ -116,9 +119,12 @@ set -o pipefail echo '{{ toml_file_content.content | b64decode }}' | python -c 'import sys, toml; print(toml.loads(sys.stdin.read())[\"version\"])' register: _imported_blueprint_version + changed_when: _imported_blueprint_version.rc != 0 # <- Uses the return code to define when the task has changed. - name: Set blueprint name in the imported TOML file ansible.builtin.shell: "sed -i '0,/name =/ s/name =.*/name = \"{{ builder_blueprint_name }}\"/' {{ builder_blueprint_src_path }}" + register: _sed_rc + changed_when: _sed_rc.rc != 0 # <- Uses the return code to define when the task has changed. - name: Set expected var output with current_version from TOML ansible.builtin.set_fact: @@ -126,8 +132,7 @@ msg: "Blueprint file written to location: {{ builder_blueprint_src_path }}" changed: true current_version: "{{ _imported_blueprint_version.stdout }}" - when: builder_blueprint_import_file is defined - + - name: Push the blueprint into image builder infra.osbuild.push_blueprint: # noqa only-builtins src: "{{ builder_blueprint_src_path }}" From 2bb21cf320d55103baadb5e63af291673944b18e Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Tue, 27 Aug 2024 08:20:06 -0600 Subject: [PATCH 03/23] Removed spaces to update lint issues --- roles/builder/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/builder/tasks/main.yml b/roles/builder/tasks/main.yml index 0622b8a9..088d6b6f 100644 --- a/roles/builder/tasks/main.yml +++ b/roles/builder/tasks/main.yml @@ -132,7 +132,7 @@ msg: "Blueprint file written to location: {{ builder_blueprint_src_path }}" changed: true current_version: "{{ _imported_blueprint_version.stdout }}" - + - name: Push the blueprint into image builder infra.osbuild.push_blueprint: # noqa only-builtins src: "{{ builder_blueprint_src_path }}" From 8578b83fb4eba8bfaad701bf875a5cae5336554b Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Tue, 27 Aug 2024 10:29:27 -0600 Subject: [PATCH 04/23] Adding #noqa to suppress lint errors --- roles/builder/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/builder/tasks/main.yml b/roles/builder/tasks/main.yml index 088d6b6f..6e5bbf9c 100644 --- a/roles/builder/tasks/main.yml +++ b/roles/builder/tasks/main.yml @@ -90,7 +90,7 @@ - name: Create a blueprint infra.osbuild.create_blueprint: # noqa only-builtins - dest: "{{ builder_blueprint_src_path }}" + dest: "{{ builder_blueprint_src_path }}" # noqa jinja[spacing] name: "{{ builder_blueprint_name }}" distro: "{{ builder_blueprint_distro | default(omit) }}" packages: "{{ builder_compose_pkgs | default(omit) }}" @@ -122,7 +122,7 @@ changed_when: _imported_blueprint_version.rc != 0 # <- Uses the return code to define when the task has changed. - name: Set blueprint name in the imported TOML file - ansible.builtin.shell: "sed -i '0,/name =/ s/name =.*/name = \"{{ builder_blueprint_name }}\"/' {{ builder_blueprint_src_path }}" + ansible.builtin.shell: "sed -i '0,/name =/ s/name =.*/name = \"{{ builder_blueprint_name }}\"/' {{ builder_blueprint_src_path }}" # noqa command-instead-of-module yaml[line-length] register: _sed_rc changed_when: _sed_rc.rc != 0 # <- Uses the return code to define when the task has changed. From 7e5d4be444a558a0e9a661442bbd3400c5cc5910 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Tue, 27 Aug 2024 10:50:19 -0600 Subject: [PATCH 05/23] Update azure pipelines to test rhel 9.3 --- .azure-pipelines/azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 1f385756..a12c7ab0 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -175,8 +175,10 @@ stages: parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 - test: rhel/9.2/ + - name: RHEL 9.3 + test: rhel/9.3/ + # - name: RHEL 9.2 + # test: rhel/9.2/ # - name: RHEL 8.8 # test: rhel/8.8/ groups: From 538e489a983d779851eadbe52f4e261311d4ed98 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Tue, 27 Aug 2024 10:59:12 -0600 Subject: [PATCH 06/23] Added --python option to ansible-test --- tests/utils/shippable/remote.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 5bf2f667..0766f784 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,6 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ + --python 3.11 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 6396cb19638e7b172d7dcd53e658e69954482cd2 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Tue, 27 Aug 2024 14:29:45 -0600 Subject: [PATCH 07/23] Updating RHEL 9.2 to 9.3 --- .azure-pipelines/azure-pipelines.yml | 134 +++++++++++++++++---------- 1 file changed, 84 insertions(+), 50 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index a12c7ab0..2a4c6f6b 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -179,8 +179,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 # test: rhel/9.2/ - # - name: RHEL 8.8 - # test: rhel/8.8/ + - name: RHEL 8.8 + test: rhel/8.8/ groups: - 1 # FIXME - ami is currently broken in CI @@ -206,10 +206,12 @@ stages: parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 edge-commit - test: rhel/9.2/ - # - name: RHEL 8.8 edge-commit - # test: rhel/8.8/ + - name: RHEL 9.3 edge-commit + test: rhel/9.3/ + # - name: RHEL 9.2 edge-commit + # test: rhel/9.2/ + - name: RHEL 8.8 edge-commit + test: rhel/8.8/ groups: - 4 - template: templates/matrix.yml @@ -218,8 +220,10 @@ stages: targets: - name: RHEL 9.2 edge-container test: rhel/9.2/ - # - name: RHEL 8.8 edge-container - # test: rhel/8.8/ + # - name: RHEL 9.2 edge-container + # test: rhel/9.2/ + - name: RHEL 8.8 edge-container + test: rhel/8.8/ groups: - 5 @@ -311,30 +315,36 @@ stages: parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 oci - test: rhel/9.2/ - # - name: RHEL 8.8 oci - # test: rhel/8.8/ + - name: RHEL 9.3 oci + test: rhel/9.3/ + # - name: RHEL 9.2 oci + # test: rhel/9.2/ + - name: RHEL 8.8 oci + test: rhel/8.8/ groups: - 14 - template: templates/matrix.yml parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 openstack - test: rhel/9.2/ - # - name: RHEL 8.8 openstack - # test: rhel/8.8/ + - name: RHEL 9.3 openstack + test: rhel/9.3/ + # - name: RHEL 9.2 openstack + # test: rhel/9.2/ + - name: RHEL 8.8 openstack + test: rhel/8.8/ groups: - 15 - template: templates/matrix.yml parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 qcow2 - test: rhel/9.2/ - # - name: RHEL 8.8 qcow2 - # test: rhel/8.8/ + - name: RHEL 9.3 qcow2 + test: rhel/9.3/ + # - name: RHEL 9.2 qcow2 + # test: rhel/9.2/ + - name: RHEL 8.8 qcow2 + test: rhel/8.8/ groups: - 16 - template: templates/matrix.yml @@ -343,28 +353,34 @@ stages: targets: - name: RHEL 9.2 tar test: rhel/9.2/ - # - name: RHEL 8.8 tar - # test: rhel/8.8/ + # - name: RHEL 9.2 tar + # test: rhel/9.2/ + - name: RHEL 8.8 tar + test: rhel/8.8/ groups: - 17 - template: templates/matrix.yml parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 vhd - test: rhel/9.2/ - # - name: RHEL 8.8 vhd - # test: rhel/8.8/ + - name: RHEL 9.3 vhd + test: rhel/9.3/ + # - name: RHEL 9.2 vhd + # test: rhel/9.2/ + - name: RHEL 8.8 vhd + test: rhel/8.8/ groups: - 18 - template: templates/matrix.yml parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 vmdk - test: rhel/9.2/ - # - name: RHEL 8.8 vmdk - # test: rhel/8.8/ + - name: RHEL 9.3 vmdk + test: rhel/9.3/ + # - name: RHEL 9.2 vmdk + # test: rhel/9.2/ + - name: RHEL 8.8 vmdk + test: rhel/8.8/ groups: - 19 @@ -377,8 +393,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 - test: rhel/9.2/ + - name: RHEL 9.3 + test: rhel/9.3/ + # - name: RHEL 9.2 + # test: rhel/9.2/ - name: RHEL 8.8 test: rhel/8.8/ groups: @@ -406,8 +424,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 edge-commit - test: rhel/9.2/ + - name: RHEL 9.3 edge-commit + test: rhel/9.3/ + # - name: RHEL 9.2 edge-commit + # test: rhel/9.2/ - name: RHEL 8.8 edge-commit test: rhel/8.8/ groups: @@ -416,8 +436,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 edge-container - test: rhel/9.2/ + - name: RHEL 9.3 edge-container + test: rhel/9.3/ + # - name: RHEL 9.2 edge-container + # test: rhel/9.2/ - name: RHEL 8.8 edge-container test: rhel/8.8/ groups: @@ -511,8 +533,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 oci - test: rhel/9.2/ + - name: RHEL 9.3 oci + test: rhel/9.3/ + # - name: RHEL 9.2 oci + # test: rhel/9.2/ - name: RHEL 8.8 oci test: rhel/8.8/ groups: @@ -521,8 +545,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 openstack - test: rhel/9.2/ + - name: RHEL 9.3 openstack + test: rhel/9.3/ + # - name: RHEL 9.2 openstack + # test: rhel/9.2/ - name: RHEL 8.8 openstack test: rhel/8.8/ groups: @@ -531,18 +557,22 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 qcow2 - test: rhel/9.2/ - - name: RHEL 8.8 qcow2 - test: rhel/8.8/ + - name: RHEL 9.3 qcow2 + test: rhel/9.3/ + # - name: RHEL 9.2 qcow2 + # test: rhel/9.2/ + # - name: RHEL 8.8 qcow2 + # test: rhel/8.8/ groups: - 16 - template: templates/matrix.yml parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 tar - test: rhel/9.2/ + - name: RHEL 9.3 tar + test: rhel/9.3/ + # - name: RHEL 9.2 tar + # test: rhel/9.2/ - name: RHEL 8.8 tar test: rhel/8.8/ groups: @@ -551,8 +581,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 vhd - test: rhel/9.2/ + - name: RHEL 9.3 vhd + test: rhel/9.3/ + # - name: RHEL 9.2 vhd + # test: rhel/9.2/ - name: RHEL 8.8 vhd test: rhel/8.8/ groups: @@ -561,8 +593,10 @@ stages: parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 vmdk - test: rhel/9.2/ + - name: RHEL 9.3 vmdk + test: rhel/9.3/ + # - name: RHEL 9.2 vmdk + # test: rhel/9.2/ - name: RHEL 8.8 vmdk test: rhel/8.8/ groups: From 2305d85dcf743512f58c716d1ecd01036b81de13 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Wed, 28 Aug 2024 17:05:38 -0600 Subject: [PATCH 08/23] Removed old entries for pipelines --- .azure-pipelines/azure-pipelines.yml | 272 +++++++++++++-------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 2a4c6f6b..54d0bafd 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -179,8 +179,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 # test: rhel/9.2/ - - name: RHEL 8.8 - test: rhel/8.8/ + # - name: RHEL 8.8 + # test: rhel/8.8/ groups: - 1 # FIXME - ami is currently broken in CI @@ -194,14 +194,14 @@ stages: # test: rhel/8.8/azure # groups: # - 2 - - template: templates/matrix.yml - parameters: - testFormat: devel/{0} - targets: - - name: fedora 38 container - test: fedora/38/ - groups: - - 3 + # - template: templates/matrix.yml + # parameters: + # testFormat: devel/{0} + # targets: + # - name: fedora 38 container + # test: fedora/38/ + # groups: + # - 3 - template: templates/matrix.yml parameters: testFormat: devel/{0} @@ -210,8 +210,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 edge-commit # test: rhel/9.2/ - - name: RHEL 8.8 edge-commit - test: rhel/8.8/ + # - name: RHEL 8.8 edge-commit + # test: rhel/8.8/ groups: - 4 - template: templates/matrix.yml @@ -222,8 +222,8 @@ stages: test: rhel/9.2/ # - name: RHEL 9.2 edge-container # test: rhel/9.2/ - - name: RHEL 8.8 edge-container - test: rhel/8.8/ + # - name: RHEL 8.8 edge-container + # test: rhel/8.8/ groups: - 5 @@ -275,22 +275,22 @@ stages: # groups: # - 9 - - template: templates/matrix.yml - parameters: - testFormat: devel/{0} - targets: - - name: fedora 38 iot-commit - test: fedora/38/ - groups: - - 10 - - template: templates/matrix.yml - parameters: - testFormat: devel/{0} - targets: - - name: fedora 38 iot-container - test: fedora/38/ - groups: - - 11 + # - template: templates/matrix.yml + # parameters: + # testFormat: devel/{0} + # targets: + # - name: fedora 38 iot-commit + # test: fedora/38/ + # groups: + # - 10 + # - template: templates/matrix.yml + # parameters: + # testFormat: devel/{0} + # targets: + # - name: fedora 38 iot-container + # test: fedora/38/ + # groups: + # - 11 # Fixme # - template: templates/matrix.yml @@ -319,8 +319,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 oci # test: rhel/9.2/ - - name: RHEL 8.8 oci - test: rhel/8.8/ + # - name: RHEL 8.8 oci + # test: rhel/8.8/ groups: - 14 - template: templates/matrix.yml @@ -331,8 +331,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 openstack # test: rhel/9.2/ - - name: RHEL 8.8 openstack - test: rhel/8.8/ + # - name: RHEL 8.8 openstack + # test: rhel/8.8/ groups: - 15 - template: templates/matrix.yml @@ -343,20 +343,20 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 qcow2 # test: rhel/9.2/ - - name: RHEL 8.8 qcow2 - test: rhel/8.8/ + # - name: RHEL 8.8 qcow2 + # test: rhel/8.8/ groups: - 16 - template: templates/matrix.yml parameters: testFormat: devel/{0} targets: - - name: RHEL 9.2 tar - test: rhel/9.2/ + - name: RHEL 9.3 tar + test: rhel/9.3/ # - name: RHEL 9.2 tar # test: rhel/9.2/ - - name: RHEL 8.8 tar - test: rhel/8.8/ + # - name: RHEL 8.8 tar + # test: rhel/8.8/ groups: - 17 - template: templates/matrix.yml @@ -367,8 +367,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 vhd # test: rhel/9.2/ - - name: RHEL 8.8 vhd - test: rhel/8.8/ + # - name: RHEL 8.8 vhd + # test: rhel/8.8/ groups: - 18 - template: templates/matrix.yml @@ -379,8 +379,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 vmdk # test: rhel/9.2/ - - name: RHEL 8.8 vmdk - test: rhel/8.8/ + # - name: RHEL 8.8 vmdk + # test: rhel/8.8/ groups: - 19 @@ -397,8 +397,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 # test: rhel/9.2/ - - name: RHEL 8.8 - test: rhel/8.8/ + # - name: RHEL 8.8 + # test: rhel/8.8/ groups: - 1 # FIXME - ami is currently broken in CI @@ -428,8 +428,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 edge-commit # test: rhel/9.2/ - - name: RHEL 8.8 edge-commit - test: rhel/8.8/ + # - name: RHEL 8.8 edge-commit + # test: rhel/8.8/ groups: - 4 - template: templates/matrix.yml @@ -440,8 +440,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 edge-container # test: rhel/9.2/ - - name: RHEL 8.8 edge-container - test: rhel/8.8/ + # - name: RHEL 8.8 edge-container + # test: rhel/8.8/ groups: - 5 @@ -493,22 +493,22 @@ stages: # groups: # - 9 - - template: templates/matrix.yml - parameters: - testFormat: 2.16/{0} - targets: - - name: fedora 38 iot-commit - test: fedora/38/ - groups: - - 10 - - template: templates/matrix.yml - parameters: - testFormat: 2.16/{0} - targets: - - name: fedora 38 iot-container - test: fedora/38/ - groups: - - 11 + # - template: templates/matrix.yml + # parameters: + # testFormat: 2.16/{0} + # targets: + # - name: fedora 38 iot-commit + # test: fedora/38/ + # groups: + # - 10 + # - template: templates/matrix.yml + # parameters: + # testFormat: 2.16/{0} + # targets: + # - name: fedora 38 iot-container + # test: fedora/38/ + # groups: + # - 11 # Fixme # - template: templates/matrix.yml @@ -537,8 +537,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 oci # test: rhel/9.2/ - - name: RHEL 8.8 oci - test: rhel/8.8/ + # - name: RHEL 8.8 oci + # test: rhel/8.8/ groups: - 14 - template: templates/matrix.yml @@ -549,8 +549,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 openstack # test: rhel/9.2/ - - name: RHEL 8.8 openstack - test: rhel/8.8/ + # - name: RHEL 8.8 openstack + # test: rhel/8.8/ groups: - 15 - template: templates/matrix.yml @@ -573,8 +573,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 tar # test: rhel/9.2/ - - name: RHEL 8.8 tar - test: rhel/8.8/ + # - name: RHEL 8.8 tar + # test: rhel/8.8/ groups: - 17 - template: templates/matrix.yml @@ -585,8 +585,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 vhd # test: rhel/9.2/ - - name: RHEL 8.8 vhd - test: rhel/8.8/ + # - name: RHEL 8.8 vhd + # test: rhel/8.8/ groups: - 18 - template: templates/matrix.yml @@ -597,8 +597,8 @@ stages: test: rhel/9.3/ # - name: RHEL 9.2 vmdk # test: rhel/9.2/ - - name: RHEL 8.8 vmdk - test: rhel/8.8/ + # - name: RHEL 8.8 vmdk + # test: rhel/8.8/ groups: - 19 @@ -611,10 +611,10 @@ stages: parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 - test: rhel/9.1/ - - name: RHEL 8.7 - test: rhel/8.7/ + - name: RHEL 9.3 + test: rhel/9.3/ + # - name: RHEL 8.7 + # test: rhel/8.7/ groups: - 1 # FIXME - ami is currently broken in CI @@ -628,32 +628,32 @@ stages: # test: rhel/8.6/azure # groups: # - 2 + # - template: templates/matrix.yml + # parameters: + # testFormat: 2.15/{0} + # targets: + # - name: Fedora 37 container + # test: fedora/37/ + # groups: + # - 3 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: Fedora 37 container - test: fedora/37/ - groups: - - 3 - - template: templates/matrix.yml - parameters: - testFormat: 2.15/{0} - targets: - - name: RHEL 9.1 edge-commit - test: rhel/9.1/ - - name: RHEL 8.7 edge-commit - test: rhel/8.7/ + - name: RHEL 9.3 edge-commit + test: rhel/9.3/ + # - name: RHEL 8.7 edge-commit + # test: rhel/8.7/ groups: - 4 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 edge-container - test: rhel/9.1/ - - name: RHEL 8.7 edge-container - test: rhel/8.7/ + - name: RHEL 9.3 edge-container + test: rhel/9.3/ + # - name: RHEL 8.7 edge-container + # test: rhel/8.7/ groups: - 5 @@ -705,22 +705,22 @@ stages: # groups: # - 9 - - template: templates/matrix.yml - parameters: - testFormat: 2.15/{0} - targets: - - name: Fedora 37 iot-commit - test: fedora/37/ - groups: - - 10 - - template: templates/matrix.yml - parameters: - testFormat: 2.15/{0} - targets: - - name: Fedora 37 iot-container - test: fedora/37/ - groups: - - 11 + # - template: templates/matrix.yml + # parameters: + # testFormat: 2.15/{0} + # targets: + # - name: Fedora 37 iot-commit + # test: fedora/37/ + # groups: + # - 10 + # - template: templates/matrix.yml + # parameters: + # testFormat: 2.15/{0} + # targets: + # - name: Fedora 37 iot-container + # test: fedora/37/ + # groups: + # - 11 # Fixme # - template: templates/matrix.yml @@ -745,60 +745,60 @@ stages: parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 oci - test: rhel/9.1/ - - name: RHEL 8.7 oci - test: rhel/8.7/ + - name: RHEL 9.3 oci + test: rhel/9.3/ + # - name: RHEL 8.7 oci + # test: rhel/8.7/ groups: - 14 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 openstack - test: rhel/9.1/ - - name: RHEL 8.7 openstack - test: rhel/8.7/ + - name: RHEL 9.3 openstack + test: rhel/9.3/ + # - name: RHEL 8.7 openstack + # test: rhel/8.7/ groups: - 15 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 qcow2 - test: rhel/9.1/ - - name: RHEL 8.7 qcow2 - test: rhel/8.7/ + - name: RHEL 9.3 qcow2 + test: rhel/9.3/ + # - name: RHEL 8.7 qcow2 + # test: rhel/8.7/ groups: - 16 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 tar - test: rhel/9.1/ - - name: RHEL 8.7 tar - test: rhel/8.7/ + - name: RHEL 9.3 tar + test: rhel/9.3/ + # - name: RHEL 8.7 tar + # test: rhel/8.7/ groups: - 17 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 vhd - test: rhel/9.1/ - - name: RHEL 8.7 vhd - test: rhel/8.7/ + - name: RHEL 9.3 vhd + test: rhel/9.3/ + # - name: RHEL 8.7 vhd + # test: rhel/8.7/ groups: - 18 - template: templates/matrix.yml parameters: testFormat: 2.15/{0} targets: - - name: RHEL 9.1 vmdk - test: rhel/9.1/ - - name: RHEL 8.7 vmdk - test: rhel/8.7/ + - name: RHEL 9.3 vmdk + test: rhel/9.3/ + # - name: RHEL 8.7 vmdk + # test: rhel/8.7/ groups: - 19 From 0fa28515bc4f46c49abdd523356b94d45a0f00a5 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Wed, 28 Aug 2024 17:17:02 -0600 Subject: [PATCH 09/23] Removed centos 8 from loop --- tests/integration/targets/role_setup_server/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/targets/role_setup_server/tasks/main.yml b/tests/integration/targets/role_setup_server/tasks/main.yml index f5627e4d..af7b03c8 100644 --- a/tests/integration/targets/role_setup_server/tasks/main.yml +++ b/tests/integration/targets/role_setup_server/tasks/main.yml @@ -29,7 +29,7 @@ dest: "/etc/osbuild-composer/repositories/{{ item }}.json" loop: - centos-9 - - centos-8 +# - centos-8 - name: Run the infra.osbuild.setup_server role ansible.builtin.import_role: From f548ea159d56a3574a0829b5130484687c9021b0 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 08:45:49 -0600 Subject: [PATCH 10/23] Adding a check --- plugins/modules/create_blueprint.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/modules/create_blueprint.py b/plugins/modules/create_blueprint.py index 245e335d..38198830 100644 --- a/plugins/modules/create_blueprint.py +++ b/plugins/modules/create_blueprint.py @@ -204,7 +204,8 @@ def create_blueprint(module, weldr): try: with open(module.params["dest"], "w") as fd: - weldr.toml.dump(toml_data, fd) + if hasattr(weldr, 'toml'): + weldr.toml.dump(toml_data, fd) except Exception as e: module.fail_json(msg=f'Failed to write to file: {module.params["dest"]}', error=e) From 3c57b87f891747a5deef86bc805b99b92b8a5eaa Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 08:54:23 -0600 Subject: [PATCH 11/23] Removing Python line --- tests/utils/shippable/remote.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 0766f784..5bf2f667 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,7 +32,6 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ - --python 3.11 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 02ee0623a35a200236b95efa06a55adebfd00c5d Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 08:57:28 -0600 Subject: [PATCH 12/23] Adding Python line again --- tests/utils/shippable/remote.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 5bf2f667..0766f784 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,6 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ + --python 3.11 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From fbb551559578d1fb9b7effe10974a4daa42d2152 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:04:48 -0600 Subject: [PATCH 13/23] added interpreter path --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 0766f784..0550d2b9 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,7 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ - --python 3.11 \ + --python-interpreter /usr/bin/python3 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 33b8f4c82e17e731235b40d76ac5304cb0610ba1 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:07:06 -0600 Subject: [PATCH 14/23] Adding python back --- tests/utils/shippable/remote.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 0550d2b9..1e717cb8 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,6 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ + --python 3.11 \ --python-interpreter /usr/bin/python3 \ --remote "${platform}/${version}" \ --remote-terminate always \ From cb21be018e03ceb65cc5b6c560c3b0e8b123801b Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:12:56 -0600 Subject: [PATCH 15/23] Change to interpreter --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 1e717cb8..9da1191f 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -33,7 +33,7 @@ ansible-test integration --color -v --retry-on-error \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ --python 3.11 \ - --python-interpreter /usr/bin/python3 \ + --python-interpreter /usr/bin/python3.11 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 0c45a3c1727873e70316fa753e62814089beeb1d Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:18:16 -0600 Subject: [PATCH 16/23] Adding venv --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 9da1191f..1c986fe5 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -33,7 +33,7 @@ ansible-test integration --color -v --retry-on-error \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ --python 3.11 \ - --python-interpreter /usr/bin/python3.11 \ + --venv \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From f4c11d7c4fef779cf666efb69139d51d4d2d2969 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:21:34 -0600 Subject: [PATCH 17/23] Adding interpreter --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 1c986fe5..d182d7c6 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -33,7 +33,7 @@ ansible-test integration --color -v --retry-on-error \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ --python 3.11 \ - --venv \ + --python-interpreter /usr/bin/python \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 5198c044909f518c3f20785d67dac17a35d510fc Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:26:42 -0600 Subject: [PATCH 18/23] Upgrade to 3.13 --- tests/utils/shippable/remote.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index d182d7c6..c42044d6 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,8 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ - --python 3.11 \ - --python-interpreter /usr/bin/python \ + --python 3.13 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 6fede557cfc033f62d2b342746c45320c4d09a34 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:28:54 -0600 Subject: [PATCH 19/23] Update to 3.12 --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index c42044d6..61341038 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,7 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ - --python 3.13 \ + --python 3.12 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 9f0ece8b607d5cdbff35f0f35b94bf677e14dc18 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:32:22 -0600 Subject: [PATCH 20/23] Removing Fedora 38 --- .azure-pipelines/azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 54d0bafd..e5ac59df 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -412,14 +412,14 @@ stages: # test: rhel/8.7/azure # groups: # - 2 - - template: templates/matrix.yml - parameters: - testFormat: 2.16/{0} - targets: - - name: fedora 38 container - test: fedora/38/ - groups: - - 3 + # - template: templates/matrix.yml + # parameters: + # testFormat: 2.16/{0} + # targets: + # - name: fedora 38 container + # test: fedora/38/ + # groups: + # - 3 - template: templates/matrix.yml parameters: testFormat: 2.16/{0} From 319bb107e46f8b1b545c592e6e6a2771deb39c3b Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 09:55:32 -0600 Subject: [PATCH 21/23] Back to 3.11 --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 61341038..0766f784 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,7 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ - --python 3.12 \ + --python 3.11 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From 2fbe82ccd4857fe37b18a54dcacbc7998ab81ca1 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 10:03:15 -0600 Subject: [PATCH 22/23] interpreter change --- tests/utils/shippable/remote.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 0766f784..1e717cb8 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -33,6 +33,7 @@ ansible-test integration --color -v --retry-on-error \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ --python 3.11 \ + --python-interpreter /usr/bin/python3 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ From a955ba33c0b7f54591781d7633d63d818ea29e94 Mon Sep 17 00:00:00 2001 From: Lester Claudio Date: Thu, 29 Aug 2024 10:10:45 -0600 Subject: [PATCH 23/23] Update python to default --- tests/utils/shippable/remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 1e717cb8..112a5468 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,7 +32,7 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ - --python 3.11 \ + --python default \ --python-interpreter /usr/bin/python3 \ --remote "${platform}/${version}" \ --remote-terminate always \