diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 1f385756..7f7fbe0e 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -106,21 +106,22 @@ stages: # Unit tests (OPTIONAL) # # https://docs.ansible.com/ansible/latest/dev_guide/testing_units.html - - stage: Sanity_devel - displayName: Ansible devel sanity - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: "{0}" - testFormat: "devel/{0}" - targets: - - name: Sanity - test: sanity - - name: Units - test: units - - name: Lint - test: lint + # - stage: Sanity_devel + # displayName: Ansible devel sanity + # dependsOn: [] + # jobs: + # - template: templates/matrix.yml + # parameters: + # nameFormat: "{0}" + # testFormat: "devel/{0}" + # targets: + # - name: Sanity + # test: sanity + # - name: Units + # test: units + # - name: Lint + # test: lint + - stage: Sanity_2_16 displayName: Ansible 2.16 sanity dependsOn: [] @@ -134,19 +135,7 @@ stages: test: sanity - name: Units test: units - - stage: Sanity_2_15 - displayName: Ansible 2.15 sanity - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: "{0}" - testFormat: "2.15/{0}" - targets: - - name: Sanity - test: sanity - - name: Units - test: units + ## Remote tests # Integration tests (RECOMMENDED) # @@ -167,757 +156,99 @@ stages: # https://github.com/ansible/ansible/blob/devel/test/lib/ansible_test/_data/completion/remote.txt # # NOTE: defined targets vary by ansible-core branch - - stage: Remote_devel - displayName: Remote devel - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: devel/{0} - targets: - - name: RHEL 9.2 - test: rhel/9.2/ - # - name: RHEL 8.8 - # test: rhel/8.8/ - groups: - - 1 - # FIXME - ami is currently broken in CI - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: RHEL 9.2 ami - # test: rhel/9.2/azure - # - name: RHEL 8.8 ami - # 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: 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 - parameters: - testFormat: devel/{0} - targets: - - name: RHEL 9.2 edge-container - test: rhel/9.2/ - # - name: RHEL 8.8 edge-container - # test: rhel/8.8/ - groups: - - 5 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: RHEL 9.2 edge-installer - # test: rhel/9.2/ - # - name: RHEL 8.8 edge-installer - # test: rhel/8.8/ - # groups: - # - 6 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: RHEL 9.2 edge-raw-image - # test: rhel/9.2/ - # - name: RHEL 8.8 edge-raw-image - # test: rhel/8.8/ - # groups: - # - 7 - - # comment out because edge-simplified-installer requires an installation device - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: RHEL 9.2 edge-simplified-installer - # test: rhel/9.2/ - # - name: RHEL 8.8 edge-simplified-installer - # test: rhel/8.8/ - # groups: - # - 8 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: RHEL 9.2 image-installer - # test: rhel/9.2/ - # - name: RHEL 8.8 image-installer - # test: rhel/8.8/ - # 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 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: fedora 38 iot-installer - # test: fedora/38/ - # groups: - # - 12 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: devel/{0} - # targets: - # - name: fedora 38 iot-raw-image - # test: fedora/38/ - # groups: - # - 13 - - template: templates/matrix.yml - parameters: - testFormat: devel/{0} - targets: - - 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/ - 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/ - groups: - - 16 - - template: templates/matrix.yml - parameters: - testFormat: devel/{0} - targets: - - 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/ - 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/ - groups: - - 19 + # - stage: Remote_devel + # displayName: Remote devel + # dependsOn: [] + # jobs: + # - template: templates/matrix.yml + # parameters: + # testFormat: devel/{0} + # targets: + # - name: RHEL 9.2 + # test: rhel/9.2/ + # - name: RHEL 8.8 + # test: rhel/8.8/ + # groups: + # - 1 # https://github.com/ansible/ansible/blob/stable-2.15/test/lib/ansible_test/_data/completion/remote.txt - stage: Remote_2_16 displayName: Remote 2.16 dependsOn: [] jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.16/{0} - targets: - - name: RHEL 9.2 - test: rhel/9.2/ - - name: RHEL 8.8 - test: rhel/8.8/ - groups: - - 1 - # FIXME - ami is currently broken in CI - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.15/{0} - # targets: - # - name: RHEL 9.1 ami - # test: rhel/9.1/azure - # - name: RHEL 8.7 ami - # 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: 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 - parameters: - testFormat: 2.16/{0} - targets: - - name: RHEL 9.2 edge-container - test: rhel/9.2/ - - name: RHEL 8.8 edge-container - test: rhel/8.8/ - groups: - - 5 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.15/{0} - # targets: - # - name: RHEL 9.1 edge-installer - # test: rhel/9.1/ - # - name: RHEL 8.7 edge-installer - # test: rhel/8.7/ - # groups: - # - 6 - - # Fixme # - template: templates/matrix.yml # parameters: - # testFormat: 2.15/{0} + # testFormat: 2.16/{0} # targets: - # - name: RHEL 9.1 edge-raw-image - # test: rhel/9.1/ - # - name: RHEL 8.7 edge-raw-image - # test: rhel/8.7/ + # - name: RHEL 9.3 + # test: rhel/9.3/ # groups: - # - 7 - - # comment out because edge-simplified-installer requireds an installation device + # - 1 # - template: templates/matrix.yml # parameters: - # testFormat: 2.15/{0} + # testFormat: 2.16/{0} # targets: - # - name: RHEL 9.1 edge-simplified-installer - # test: rhel/9.1/ - # - name: RHEL 8.7 edge-simplified-installer - # test: rhel/8.7/ + # - name: RHEL 9.3 edge-commit + # test: rhel/9.3/ # groups: - # - 8 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.15/{0} - # targets: - # - name: RHEL 9.1 image-installer - # test: rhel/9.1/ - # - name: RHEL 8.7 image-installer - # test: rhel/8.7/ - # 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 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.15/{0} - # targets: - # - name: fedora 37 iot-installer - # test: fedora/37/ - # groups: - # - 12 - - # Fixme + # - 2 # - template: templates/matrix.yml # parameters: - # testFormat: 2.15/{0} + # testFormat: 2.16/{0} # targets: - # - name: fedora 37 iot-raw-image - # test: fedora/37/ + # - name: RHEL 9.3 edge-container + # test: rhel/9.3/ # groups: - # - 13 - - template: templates/matrix.yml - parameters: - testFormat: 2.16/{0} - targets: - - 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: 2.16/{0} - targets: - - name: RHEL 9.2 openstack - test: rhel/9.2/ - - name: RHEL 8.8 openstack - test: rhel/8.8/ - groups: - - 15 + # - 3 - template: templates/matrix.yml 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 oci + test: rhel/9.3/ groups: - - 16 + - 4 - template: templates/matrix.yml parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 tar - test: rhel/9.2/ - - name: RHEL 8.8 tar - test: rhel/8.8/ + - name: RHEL 9.3 openstack + test: rhel/9.3/ groups: - - 17 + - 5 - template: templates/matrix.yml parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 vhd - test: rhel/9.2/ - - name: RHEL 8.8 vhd - test: rhel/8.8/ + - name: RHEL 9.3 qcow2 + test: rhel/9.3/ groups: - - 18 + - 6 - template: templates/matrix.yml parameters: testFormat: 2.16/{0} targets: - - name: RHEL 9.2 vmdk - test: rhel/9.2/ - - name: RHEL 8.8 vmdk - test: rhel/8.8/ - groups: - - 19 - - # https://github.com/ansible/ansible/blob/stable-2.14/test/lib/ansible_test/_data/completion/remote.txt - - stage: Remote_2_15 - displayName: Remote 2.15 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.15/{0} - targets: - - name: RHEL 9.1 - test: rhel/9.1/ - - name: RHEL 8.7 - test: rhel/8.7/ - groups: - - 1 - # FIXME - ami is currently broken in CI - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.14/{0} - # targets: - # - name: RHEL 9.0 ami - # test: rhel/9.0/azure - # - name: RHEL 8.6 ami - # test: rhel/8.6/azure - # groups: - # - 2 - - template: templates/matrix.yml - parameters: - testFormat: 2.15/{0} - targets: - - name: Fedora 37 container - test: fedora/37/ + - name: RHEL 9.3 tar + test: rhel/9.3/ 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/ - 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/ - groups: - - 5 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.14/{0} - # targets: - # - name: RHEL 9.0 edge-installer - # test: rhel/9.0/ - # - name: RHEL 8.6 edge-installer - # test: rhel/8.6/ - # groups: - # - 6 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.14/{0} - # targets: - # - name: RHEL 9.0 edge-raw-image - # test: rhel/9.0/ - # - name: RHEL 8.6 edge-raw-image - # test: rhel/8.6/ - # groups: - # - 7 - - # comment out because edge-simplified-installer requireds an installation device + - 7 # - template: templates/matrix.yml # parameters: - # testFormat: 2.14/{0} + # testFormat: 2.16/{0} # targets: - # - name: RHEL 9.0 edge-simplified-installer - # test: rhel/9.0/ - # - name: RHEL 8.6 edge-simplified-installer - # test: rhel/8.6/ + # - name: RHEL 9.3 vhd + # test: rhel/9.3/ # groups: # - 8 - - # Fixme # - template: templates/matrix.yml # parameters: - # testFormat: 2.14/{0} + # testFormat: 2.16/{0} # targets: - # - name: RHEL 9.0 image-installer - # test: rhel/9.0/ - # - name: RHEL 8.6 image-installer - # test: rhel/8.6/ + # - name: RHEL 9.3 vmdk + # test: rhel/9.3/ # 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 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.14/{0} - # targets: - # - name: Fedora 36 iot-installer - # test: fedora/36/ - # groups: - # - 12 - - # Fixme - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.14/{0} - # targets: - # - name: Fedora 36 iot-raw-image - # test: fedora/36/ - # groups: - # - 13 - - template: templates/matrix.yml - parameters: - testFormat: 2.15/{0} - targets: - - name: RHEL 9.1 oci - test: rhel/9.1/ - - 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/ - 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/ - 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/ - 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/ - 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/ - groups: - - 19 - - # # https://github.com/ansible/ansible/blob/stable-2.13/test/lib/ansible_test/_data/completion/remote.txt - # - stage: Remote_2_13 - # displayName: Remote 2.13 - # dependsOn: [] - # jobs: - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 - # test: rhel/9.0/ - # - name: RHEL 8.5 - # test: rhel/8.5/ - # groups: - # - 1 - # # FIXME - ami is currently broken in CI - # # - template: templates/matrix.yml - # # parameters: - # # testFormat: 2.13/{0} - # # targets: - # # - name: RHEL 9.0 ami - # # test: rhel/9.0/azure - # # - name: RHEL 8.5 ami - # # test: rhel/8.5/azure - # # groups: - # # - 2 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 edge-commit - # test: rhel/9.0/ - # - name: RHEL 8.5 edge-commit - # test: rhel/8.5/ - # groups: - # - 4 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 edge-container - # test: rhel/9.0/ - # - name: RHEL 8.5 edge-container - # test: rhel/8.5/ - # groups: - # - 5 - - # # Fixme - # # - template: templates/matrix.yml - # # parameters: - # # testFormat: 2.13/{0} - # # targets: - # # - name: RHEL 9.0 edge-installer - # # test: rhel/9.0/ - # # - name: RHEL 8.5 edge-installer - # # test: rhel/8.5/ - # # groups: - # # - 6 - - # # Fixme - # # - template: templates/matrix.yml - # # parameters: - # # testFormat: 2.13/{0} - # # targets: - # # - name: RHEL 9.0 edge-raw-image - # # test: rhel/9.0/ - # # groups: - # # - 7 - - # # comment out because edge-simplified-installer requireds an installation device - # # - template: templates/matrix.yml - # # parameters: - # # testFormat: 2.13/{0} - # # targets: - # # - name: RHEL 9.0 edge-simplified-installer - # # test: rhel/9.0/ - # # groups: - # # - 8 - - # # Fixme - # # - template: templates/matrix.yml - # # parameters: - # # testFormat: 2.13/{0} - # # targets: - # # - name: RHEL 9.0 image-installer - # # test: rhel/9.0/ - # # - name: RHEL 8.5 image-installer - # # test: rhel/8.5/ - # # groups: - # # - 9 - - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 oci - # test: rhel/9.0/ - # - name: RHEL 8.5 oci - # test: rhel/8.5/ - # groups: - # - 14 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 openstack - # test: rhel/9.0/ - # - name: RHEL 8.5 openstack - # test: rhel/8.5/ - # groups: - # - 15 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 qcow2 - # test: rhel/9.0/ - # - name: RHEL 8.5 qcow2 - # test: rhel/8.5/ - # groups: - # - 16 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 tar - # test: rhel/9.0/ - # - name: RHEL 8.5 tar - # test: rhel/8.5/ - # groups: - # - 17 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 vhd - # test: rhel/9.0/ - # - name: RHEL 8.5 vhd - # test: rhel/8.5/ - # groups: - # - 18 - # - template: templates/matrix.yml - # parameters: - # testFormat: 2.13/{0} - # targets: - # - name: RHEL 9.0 vmdk - # test: rhel/9.0/ - # - name: RHEL 8.5 vmdk - # test: rhel/8.5/ - # groups: - # - 19 - ## Finally # This job does nothing and is only used for the branch protection # or multi-stage CI jobs, like making sure that all tests pass before @@ -925,11 +256,7 @@ stages: - stage: Summary condition: succeededOrFailed() dependsOn: - - Sanity_devel - Sanity_2_16 - - Sanity_2_15 - - Remote_devel - Remote_2_16 - - Remote_2_15 jobs: - template: templates/coverage.yml diff --git a/plugins/modules/create_blueprint.py b/plugins/modules/create_blueprint.py index 245e335d..3a04281c 100644 --- a/plugins/modules/create_blueprint.py +++ b/plugins/modules/create_blueprint.py @@ -204,6 +204,7 @@ def create_blueprint(module, weldr): try: with open(module.params["dest"], "w") as 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) diff --git a/roles/builder/tasks/main.yml b/roles/builder/tasks/main.yml index 936e6377..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) }}" @@ -99,32 +99,39 @@ 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 - copy: + 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 - 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 + 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 - 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. - 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 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 @@ -248,22 +255,11 @@ - builder_compose_type is defined - "'installer' in builder_compose_type or 'raw' in builder_compose_type" block: - - name: Create __edge_insaller_customizations var - ansible.builtin.set_fact: - __edge_insaller_customizations: {} - - - name: Set _edge_insaller_customizations value including only fdo and installation_device customizations - ansible.builtin.set_fact: - __edge_insaller_customizations: "{{ __edge_insaller_customizations | combine({item.key: item.value}) }}" - when: "item.key in ['fips']" - with_dict: "{{ builder_compose_customizations }}" - - name: Create blank blueprint infra.osbuild.create_blueprint: # noqa only-builtins dest: "{{ builder_blueprint_src_path }}" name: "{{ builder_blueprint_name }}-empty" distro: "{{ builder_blueprint_distro | default(omit) }}" - customizations: "{{ __edge_insaller_customizations }}" register: __builder_blueprint_output # noqa var-naming[no-role-prefix] when: - "'simplified' not in builder_compose_type and 'edge' in builder_compose_type or 'iot' in builder_compose_type" diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index 5bf2f667..19562fac 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -32,6 +32,8 @@ ansible-test integration --color -v --retry-on-error \ ${COVERAGE:+"$COVERAGE"} \ ${CHANGED:+"$CHANGED"} \ ${UNSTABLE:+"$UNSTABLE"} \ + --python 3.9 \ + --python-interpreter /usr/bin/python3 \ --remote "${platform}/${version}" \ --remote-terminate always \ --remote-stage "${stage}" \ diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 58363f62..814085f2 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -138,7 +138,7 @@ find plugins -type d -empty -print -delete if [[ "${COVERAGE:-}" == "--coverage" ]]; then timeout=60 else - timeout=50 + timeout=60 fi export ANSIBLE_TEST_PREFER_PODMAN=1