Skip to content

Commit e814ae4

Browse files
committed
ci: Pass in __bootc_validation as boolean, not string
Pass in a YAML true value as `__bootc_validation: true` using the --extra-vars option to ensure that `__bootc_validation` is treated as a boolean and not a string value. `-e "__bootc_validation: true"` You can also use JSON format: `-e '{"__bootc_validation": true}'` but YAML is simpler in this case. Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 65b5d1a commit e814ae4

8 files changed

Lines changed: 9 additions & 8 deletions

.ansible-lint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ kinds:
1818
skip_list:
1919
- fqcn-builtins
2020
- var-naming[no-role-prefix]
21+
- name[unique]
2122
exclude_paths:
2223
- tests/roles/
2324
- .github/

.github/workflows/ansible-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install tox, tox-lsr
3333
run: |
3434
set -euxo pipefail
35-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0"
35+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.1"
3636
3737
- name: Convert role to collection format
3838
id: collection

.github/workflows/ansible-managed-var-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install tox, tox-lsr
3131
run: |
3232
set -euxo pipefail
33-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0"
33+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.1"
3434
3535
- name: Run ansible-plugin-scan
3636
run: |

.github/workflows/ansible-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install tox, tox-lsr
3434
run: |
3535
set -euxo pipefail
36-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.1"
3737
3838
- name: Convert role to collection format
3939
run: |

.github/workflows/python-unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
tox=tox
6868
virtualenv=virtualenv
6969
fi
70-
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.11.0"
70+
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.11.1"
7171
# If you have additional OS dependency packages e.g. libcairo2-dev
7272
# then put them in .github/config/ubuntu-requirements.txt, one
7373
# package per line.

.github/workflows/qemu-kvm-integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
python3 -m pip install --upgrade pip
106106
sudo apt update
107107
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86
108-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.0"
108+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.11.1"
109109
110110
# HACK: Drop this when moving this workflow to 26.04 LTS
111111
- name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5
@@ -199,7 +199,7 @@ jobs:
199199
if tox -e "$env" -- --image-file "$(pwd)/$image_file" \
200200
--log-level debug $TOX_ARGS \
201201
--lsr-report-errors-url DEFAULT \
202-
-e __bootc_validation=true \
202+
-e "__bootc_validation: true" \
203203
-- "$test" >out 2>&1; then
204204
mv out "${test}-PASS.log"
205205
else

.github/workflows/tft_citest_bad.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ jobs:
3333
echo "The workflow $PENDING_RUN is still running, wait for it to finish to re-run"
3434
exit 1
3535
fi
36+
# TF tests can fail or can be cancelled due to TF internal issues
3637
RUN_ID=$(gh api "repos/$REPO/actions/workflows/tft.yml/runs?event=issue_comment" \
37-
| jq -r "[.workflow_runs[] | select( .display_title == \"$PR_TITLE\" ) | select( .conclusion == \"failure\" ) | .id][0]")
38+
| jq -r "[.workflow_runs[] | select( .display_title == \"$PR_TITLE\" ) | select( .conclusion == \"failure\" or .conclusion == \"cancelled\" ) | .id][0]")
3839
if [ "$RUN_ID" = "null" ]; then
3940
echo "Failed workflow not found, exiting"
4041
exit 1

contributing.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ explanation about the NetworkManager API.
118118
podman stop lsr-ci-c7
119119
podman rm lsr-ci-c7
120120
```
121-
122121
## Running CI Tests Locally
123122

124123
### Use tox-lsr with qemu

0 commit comments

Comments
 (0)