Skip to content

Commit deba228

Browse files
[ISV-6393] Update playboks for ansible 2.19 #472
1 parent 8c5ed7a commit deba228

File tree

12 files changed

+15
-19
lines changed

12 files changed

+15
-19
lines changed

.github/workflows/yaml_and_ansible_linting.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@ jobs:
2222

2323
# Runs a set of commands using the runners shell
2424
- name: "Ansible-lint"
25-
# Install ansible-lint(5.0.6) together with yamllint(1.26.0) and run the linting on the whole repo
25+
# Install ansible-lint(25.9.2) together with yamllint(1.34.0) and run the linting on the whole repo
2626
run: |
27+
set -e
2728
python -m pip install ansible
28-
pip install ansible-lint==5.0.6 yamllint==1.26.0
29-
ansible-lint -c ansible-lint.yml *.yml |& tee lint-output.txt
30-
if egrep -i '^(warning.*listing.*violation\(s)\)' lint-output.txt; then
31-
exit 1
32-
else
33-
exit 0
34-
fi
29+
pip install ansible-lint==25.9.2 yamllint==1.34.0
30+
ansible-lint -c .ansible-lint *.yml
3531
3632
3733
- name: "Yaml-lint"

local-test-operator-bundle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
umoci_bin_path: "{{ testing_bin_path }}/umoci"
2525
opm_bin_path: "{{ testing_bin_path }}/opm"
2626
operator_sdk_bin_path: "{{ testing_bin_path }}/operator-sdk"
27-
oc_bin_path: '{{ ''kubectl'' if run_upstream else "{{ testing_bin_path }}/oc" }}'
27+
oc_bin_path: "{{ 'kubectl' if run_upstream else testing_bin_path + '/oc' }}"
2828

2929

3030
- name: "Install operator testing prerequisites"

local-test-operator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
scorecard_cr_dir: "{{ work_dir }}/scorecard-cr-files"
4040
kube_objects_dir: "{{ work_dir }}/kube_objects"
4141
testing_bin_path: "{{ work_dir }}/bin"
42-
oc_bin_path: '{{ ''kubectl'' if run_upstream else "{{ testing_bin_path }}/oc" }}'
42+
oc_bin_path: "{{ 'kubectl' if run_upstream else testing_bin_path + '/oc' }}"
4343
jq_bin_path: "{{ testing_bin_path }}/jq"
4444
yq_bin_path: "{{ testing_bin_path }}/yq"
4545
go_bin_path: "{{ testing_bin_path }}/go/bin/go"

roles/inject_openshift_kube_objects/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
- name: "Read yaml file content to get the namespace"
2020
set_fact:
21-
content="{{ lookup('file', '{{ kube_objects_dir }}/kube_objects.yaml') | from_yaml }}"
21+
content: "{{ lookup('file', kube_objects_dir + '/kube_objects.yaml') | from_yaml }}"
2222
no_log: true
2323
ignore_errors: true
2424

roles/install_operator_prereqs/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- name: "Set basic facts"
1212
set_fact:
1313
operator_sdk_bin_path: "{{ testing_bin_path}}/operator-sdk"
14-
oc_bin_path: '{{ ''kubectl'' if run_upstream else "{{ testing_bin_path }}/oc" }}'
14+
oc_bin_path: "{{ 'kubectl' if run_upstream else testing_bin_path + '/oc' }}"
1515
jq_bin_path: "{{ testing_bin_path }}/jq"
1616
yq_bin_path: "{{ testing_bin_path }}/yq"
1717
go_bin_path: "{{ testing_bin_path }}/go/bin/go"

upstream/local-deploy-operator-bundle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
opm_bin_path: "{{ testing_bin_path }}/opm"
4545
catalog_repo_dir: /tmp/community-operators-for-catalog
4646
operator_sdk_bin_path: "{{ testing_bin_path }}/operator-sdk"
47-
oc_bin_path: '{{ ''kubectl'' if run_upstream else "{{ testing_bin_path }}/oc" }}'
47+
oc_bin_path: "{{ 'kubectl' if run_upstream else testing_bin_path + '/oc' }}"
4848
# mirror_apply: true
4949
doic_skip_file_check: false
5050
operator_upgrade_testing_disabled: false

upstream/local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
run_manifest_test: "{{ run_manifest_test | default(false) }}"
171171
run_bundle_test: "{{ run_bundle_test | default(true) }}"
172172
image_protocol: "{{ image_protocol | default('docker://') }}"
173-
oc_bin_path: '{{ ''kubectl'' if run_upstream else "{{ testing_bin_path }}/oc" }}'
173+
oc_bin_path: "{{ 'kubectl' if run_upstream else testing_bin_path + '/oc' }}"
174174
tags:
175175
- always
176176
- test

upstream/roles/index_verify/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
msg: "Operators not in sync: '{{ iv_operators_failed | join(',') }}' [{{ iv_operators_failed | length }}/{{ iv_index_operator_ana.keys() | length }}]!!! More info above or in '{{ iv_output_file }}' file"
6363
when:
6464
- iv_operators_failed is defined
65-
- iv_operators_failed | length
65+
- iv_operators_failed | length > 0
6666

6767
- name: "Fail with list of operators that are not in sync"
6868
ansible.builtin.debug:

upstream/roles/inject_openshift_kube_objects/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
- name: "Read yaml file content to get the namespace"
3434
set_fact:
35-
content="{{ lookup('file', '{{ kube_objects_dir }}/kube_objects.yaml') | from_yaml }}"
35+
content: "{{ lookup('file', kube_objects_dir + '/kube_objects.yaml') | from_yaml }}"
3636
no_log: true
3737
ignore_errors: true
3838

upstream/roles/install_operator_prereqs/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- name: "Set basic facts"
1313
set_fact:
1414
operator_sdk_bin_path: "{{ testing_bin_path }}/operator-sdk"
15-
oc_bin_path: '{{ ''kubectl'' if run_upstream else "{{ testing_bin_path }}/oc" }}'
15+
oc_bin_path: "{{ 'kubectl' if run_upstream else testing_bin_path + '/oc' }}"
1616
jq_bin_path: "{{ testing_bin_path }}/jq"
1717
yq_bin_path: "{{ testing_bin_path }}/yq"
1818
go_bin_path: "{{ testing_bin_path }}/go/bin/go"

0 commit comments

Comments
 (0)