Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pipeline versions latest #366

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions .azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,27 +121,27 @@
test: units
- name: Lint
test: lint
- stage: Sanity_2_16
displayName: Ansible 2.16 sanity
- stage: Sanity_2_17
displayName: Ansible 2.17 sanity
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
nameFormat: "{0}"
testFormat: "2.16/{0}"
testFormat: "2.17/{0}"
targets:
- name: Sanity
test: sanity
- name: Units
test: units
- stage: Sanity_2_15
displayName: Ansible 2.15 sanity
- stage: Sanity_2_16
displayName: Ansible 2.16 sanity
dependsOn: []
jobs:
- template: templates/matrix.yml
parameters:
nameFormat: "{0}"
testFormat: "2.15/{0}"
testFormat: "2.16/{0}"
targets:
- name: Sanity
test: sanity
Expand Down Expand Up @@ -175,9 +175,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2
test: rhel/9.2/
- name: RHEL 9.3
test: rhel/9.3/
# - name: RHEL 8.8

Check warning on line 180 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

180:13 [comments-indentation] comment not indented like content

Check warning on line 180 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

180:13 [comments-indentation] comment not indented like content

Check warning on line 180 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

180:13 [comments-indentation] comment not indented like content

Check warning on line 180 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

180:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 1
Expand All @@ -197,16 +197,16 @@
testFormat: devel/{0}
targets:
- name: fedora 38 container
test: fedora/38/
test: fedora/39/
groups:
- 3
- template: templates/matrix.yml
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 edge-commit
test: rhel/9.2/
- name: RHEL 9.3 edge-commit
test: rhel/9.3/
# - name: RHEL 8.8 edge-commit

Check warning on line 209 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

209:13 [comments-indentation] comment not indented like content

Check warning on line 209 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

209:13 [comments-indentation] comment not indented like content

Check warning on line 209 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

209:13 [comments-indentation] comment not indented like content

Check warning on line 209 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

209:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 4
Expand All @@ -214,9 +214,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 edge-container
test: rhel/9.2/
- name: RHEL 9.3 edge-container
test: rhel/9.3/
# - name: RHEL 8.8 edge-container

Check warning on line 219 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

219:13 [comments-indentation] comment not indented like content

Check warning on line 219 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

219:13 [comments-indentation] comment not indented like content

Check warning on line 219 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

219:13 [comments-indentation] comment not indented like content

Check warning on line 219 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

219:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 5
Expand Down Expand Up @@ -273,16 +273,16 @@
parameters:
testFormat: devel/{0}
targets:
- name: fedora 38 iot-commit
test: fedora/38/
- name: fedora 39 iot-commit
test: fedora/39/
groups:
- 10
- template: templates/matrix.yml
parameters:
testFormat: devel/{0}
targets:
- name: fedora 38 iot-container
test: fedora/38/
- name: fedora 39 iot-container
test: fedora/39/
groups:
- 11

Expand All @@ -309,9 +309,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 oci
test: rhel/9.2/
- name: RHEL 9.3 oci
test: rhel/9.3/
# - name: RHEL 8.8 oci

Check warning on line 314 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

314:13 [comments-indentation] comment not indented like content

Check warning on line 314 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

314:13 [comments-indentation] comment not indented like content

Check warning on line 314 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

314:13 [comments-indentation] comment not indented like content

Check warning on line 314 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

314:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 14
Expand All @@ -319,9 +319,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 openstack
test: rhel/9.2/
- name: RHEL 9.3 openstack
test: rhel/9.3/
# - name: RHEL 8.8 openstack

Check warning on line 324 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

324:13 [comments-indentation] comment not indented like content

Check warning on line 324 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

324:13 [comments-indentation] comment not indented like content

Check warning on line 324 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

324:13 [comments-indentation] comment not indented like content

Check warning on line 324 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

324:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 15
Expand All @@ -329,9 +329,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 qcow2
test: rhel/9.2/
- name: RHEL 9.3 qcow2
test: rhel/9.3/
# - name: RHEL 8.8 qcow2

Check warning on line 334 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

334:13 [comments-indentation] comment not indented like content

Check warning on line 334 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

334:13 [comments-indentation] comment not indented like content

Check warning on line 334 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

334:13 [comments-indentation] comment not indented like content

Check warning on line 334 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

334:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 16
Expand All @@ -339,9 +339,9 @@
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 8.8 tar

Check warning on line 344 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

344:13 [comments-indentation] comment not indented like content

Check warning on line 344 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

344:13 [comments-indentation] comment not indented like content

Check warning on line 344 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

344:13 [comments-indentation] comment not indented like content

Check warning on line 344 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

344:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 17
Expand All @@ -349,9 +349,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 vhd
test: rhel/9.2/
- name: RHEL 9.3 vhd
test: rhel/9.3/
# - name: RHEL 8.8 vhd

Check warning on line 354 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

354:13 [comments-indentation] comment not indented like content

Check warning on line 354 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

354:13 [comments-indentation] comment not indented like content

Check warning on line 354 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

354:13 [comments-indentation] comment not indented like content

Check warning on line 354 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

354:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 18
Expand All @@ -359,9 +359,9 @@
parameters:
testFormat: devel/{0}
targets:
- name: RHEL 9.2 vmdk
test: rhel/9.2/
- name: RHEL 9.3 vmdk
test: rhel/9.3/
# - name: RHEL 8.8 vmdk

Check warning on line 364 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

364:13 [comments-indentation] comment not indented like content

Check warning on line 364 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

364:13 [comments-indentation] comment not indented like content

Check warning on line 364 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Blue

364:13 [comments-indentation] comment not indented like content

Check warning on line 364 in .azure-pipelines/azure-pipelines.yml

View workflow job for this annotation

GitHub Actions / Lint Green

364:13 [comments-indentation] comment not indented like content
# test: rhel/8.8/
groups:
- 19
Expand Down
48 changes: 24 additions & 24 deletions roles/builder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,30 +99,30 @@
when: builder_blueprint_import_file is not defined

- block:
- name: Copy the blueprint file
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:
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\"])'"
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 }}"

- name: Set expected var output with current_version from TOML
set_fact:
builder_blueprint_output:
msg: "Blueprint file written to location: {{ builder_blueprint_src_path }}"
changed: true
current_version: "{{ _imported_blueprint_version.stdout }}"
- name: Copy the blueprint file
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:
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\"])'"
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 }}"

- name: Set expected var output with current_version from TOML
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
Expand Down
Loading