Skip to content

Commit 95574d6

Browse files
committed
ci: tox-lsr 3.17.0 - container test improvements, use ansible 2.20 for fedora 43 [citest_skip]
tox-lsr 3.17.0 has some container test improvements - better output, faster runs Use Ansible 2.20 for qemu/container tests on fedora 43 Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 072113c commit 95574d6

12 files changed

Lines changed: 29 additions & 26 deletions

.ansible-lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ exclude_paths:
2121
- .markdownlint.yaml
2222
- examples/roles/
2323
mock_roles:
24-
- linux-system-roles.template
24+
- linux-system-roles.trustee_attestation_server
2525
supported_ansible_also:
2626
- "2.14.0"

.github/workflows/ansible-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install tox, tox-lsr
3636
run: |
3737
set -euxo pipefail
38-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
38+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
3939
4040
- name: Convert role to collection format
4141
id: collection

.github/workflows/ansible-managed-var-comment.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.16.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
3737
3838
- name: Run ansible-plugin-scan
3939
run: |

.github/workflows/ansible-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install tox, tox-lsr
3737
run: |
3838
set -euxo pipefail
39-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
39+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
4040
4141
- name: Convert role to collection format
4242
run: |

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- { image: "centos-9", env: "qemu-ansible-core-2-16" }
3232
- { image: "centos-10", env: "qemu-ansible-core-2-17" }
3333
- { image: "fedora-42", env: "qemu-ansible-core-2-19" }
34-
- { image: "fedora-43", env: "qemu-ansible-core-2-19" }
34+
- { image: "fedora-43", env: "qemu-ansible-core-2-20" }
3535
- { image: "leap-15.6", env: "qemu-ansible-core-2-18" }
3636

3737
# container
@@ -41,9 +41,9 @@ jobs:
4141
# - { image: "centos-10", env: "container-ansible-core-2-17" }
4242
- { image: "centos-10-bootc", env: "container-ansible-core-2-17" }
4343
- { image: "fedora-42", env: "container-ansible-core-2-17" }
44-
- { image: "fedora-43", env: "container-ansible-core-2-19" }
44+
- { image: "fedora-43", env: "container-ansible-core-2-20" }
4545
- { image: "fedora-42-bootc", env: "container-ansible-core-2-17" }
46-
- { image: "fedora-43-bootc", env: "container-ansible-core-2-19" }
46+
- { image: "fedora-43-bootc", env: "container-ansible-core-2-20" }
4747

4848
env:
4949
TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi"
@@ -110,7 +110,7 @@ jobs:
110110
python3 -m pip install --upgrade pip
111111
sudo apt update
112112
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86
113-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0"
113+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
114114
115115
# HACK: Drop this when moving this workflow to 26.04 LTS
116116
- name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5
@@ -175,10 +175,10 @@ jobs:
175175
if: steps.check_platform.outputs.supported && startsWith(matrix.scenario.env, 'container')
176176
run: |
177177
set -euo pipefail
178-
# HACK: debug.py/profile.py setup is broken
179-
export LSR_CONTAINER_PROFILE=false
180-
export LSR_CONTAINER_PRETTY=false
181178
rc=0
179+
# we cannot skip these on the first test
180+
export SKIP_REQUIREMENTS=false
181+
export SKIP_CALLBACK_PLUGINS=false
182182
for t in tests/tests_*.yml; do
183183
if tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} $t > ${t}.log 2>&1; then
184184
echo "PASS: $(basename $t)"
@@ -188,6 +188,9 @@ jobs:
188188
mv "${t}.log" "${t}-FAIL.log"
189189
rc=1
190190
fi
191+
# we can skip these on subsequent runs
192+
export SKIP_REQUIREMENTS=true
193+
export SKIP_CALLBACK_PLUGINS=true
191194
done
192195
exit $rc
193196

.github/workflows/tft.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
tf_scope: private
182182
api_key: ${{ secrets.TF_API_KEY_RH }}
183183
update_pull_request_status: false
184-
tmt_plan_filter: "tag:playbooks_parallel,template"
184+
tmt_plan_filter: "tag:playbooks_parallel,trustee_attestation_server"
185185

186186
- name: Set final commit status
187187
uses: myrotvorets/set-commit-status-action@master

.github/workflows/weekly_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Weekly CI trigger
44
on: # yamllint disable-line rule:truthy
55
workflow_dispatch:
66
schedule:
7-
- cron: 0 0 * * 6
7+
- cron: 30 23 * * 6
88
env:
99
BRANCH_NAME: weekly-ci
1010
COMMIT_MESSAGE: "ci: This PR is to trigger periodic CI testing"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Role Name
22

3-
[![ansible-lint.yml](https://github.com/linux-system-roles/template/actions/workflows/ansible-lint.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/ansible-lint.yml) [![ansible-test.yml](https://github.com/linux-system-roles/template/actions/workflows/ansible-test.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/ansible-test.yml) [![codespell.yml](https://github.com/linux-system-roles/template/actions/workflows/codespell.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/codespell.yml) [![markdownlint.yml](https://github.com/linux-system-roles/template/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/markdownlint.yml) [![qemu-kvm-integration-tests.yml](https://github.com/linux-system-roles/template/actions/workflows/qemu-kvm-integration-tests.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/qemu-kvm-integration-tests.yml) [![shellcheck.yml](https://github.com/linux-system-roles/template/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/shellcheck.yml) [![tft.yml](https://github.com/linux-system-roles/template/actions/workflows/tft.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/tft.yml) [![tft_citest_bad.yml](https://github.com/linux-system-roles/template/actions/workflows/tft_citest_bad.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/tft_citest_bad.yml) [![woke.yml](https://github.com/linux-system-roles/template/actions/workflows/woke.yml/badge.svg)](https://github.com/linux-system-roles/template/actions/workflows/woke.yml)
3+
[![ansible-lint.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-lint.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-lint.yml) [![ansible-test.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-test.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-test.yml) [![codespell.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/codespell.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/codespell.yml) [![markdownlint.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/markdownlint.yml) [![qemu-kvm-integration-tests.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/qemu-kvm-integration-tests.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/qemu-kvm-integration-tests.yml) [![shellcheck.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/shellcheck.yml) [![tft.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft.yml) [![tft_citest_bad.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft_citest_bad.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft_citest_bad.yml) [![woke.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/woke.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/woke.yml)
44

55
![template](https://github.com/linux-system-roles/template/workflows/tox/badge.svg)
66

contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to the template Linux System Role
1+
# Contributing to the trustee_attestation_server Linux System Role
22

33
## Where to start
44

@@ -12,12 +12,12 @@ This has all of the common information that all role developers need:
1212
* How to create git commits and submit pull requests
1313

1414
**Bugs and needed implementations** are listed on
15-
[Github Issues](https://github.com/linux-system-roles/template/issues).
15+
[Github Issues](https://github.com/linux-system-roles/trustee_attestation_server/issues).
1616
Issues labeled with
17-
[**help wanted**](https://github.com/linux-system-roles/template/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
17+
[**help wanted**](https://github.com/linux-system-roles/trustee_attestation_server/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
1818
are likely to be suitable for new contributors!
1919

20-
**Code** is managed on [Github](https://github.com/linux-system-roles/template), using
20+
**Code** is managed on [Github](https://github.com/linux-system-roles/trustee_attestation_server), using
2121
[Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests).
2222

2323
## Running CI Tests Locally

plans/README-plans.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Introduction CI Testing Plans
22

3-
Linux System Roles CI runs [tmt](https://tmt.readthedocs.io/en/stable/index.html) test plans in [Testing farm](https://docs.testing-farm.io/Testing%20Farm/0.1/index.html) with the [tft.yml](https://github.com/linux-system-roles/template/blob/main/.github/workflows/tft.yml) GitHub workflow.
3+
Linux System Roles CI runs [tmt](https://tmt.readthedocs.io/en/stable/index.html) test plans in [Testing farm](https://docs.testing-farm.io/Testing%20Farm/0.1/index.html) with the [tft.yml](https://github.com/linux-system-roles/trustee_attestation_server/blob/main/.github/workflows/tft.yml) GitHub workflow.
44

55
The `plans/test_playbooks_parallel.fmf` plan is a test plan that runs test playbooks in parallel on multiple managed nodes.
66
`plans/test_playbooks_parallel.fmf` is generated centrally from `https://github.com/linux-system-roles/.github/`.
@@ -16,7 +16,7 @@ The `plans/test_playbooks_parallel.fmf` plan does the following steps:
1616
2. Does the required preparation on systems.
1717
3. For the given role and the given PR, runs the general test from [test.sh](https://github.com/linux-system-roles/tft-tests/blob/main/tests/general/test.sh).
1818

19-
The [tft.yml](https://github.com/linux-system-roles/template/blob/main/.github/workflows/tft.yml) workflow runs the above plan and uploads the results to our Fedora storage for public access.
19+
The [tft.yml](https://github.com/linux-system-roles/trustee_attestation_server/blob/main/.github/workflows/tft.yml) workflow runs the above plan and uploads the results to our Fedora storage for public access.
2020
This workflow uses Testing Farm's Github Action [Schedule tests on Testing Farm](https://github.com/marketplace/actions/schedule-tests-on-testing-farm).
2121

2222
## Running Tests
@@ -47,7 +47,7 @@ You can run tests locally with the `tmt try` cli or remotely in Testing Farm.
4747
$ TESTING_FARM_API_TOKEN=<your_api_token> \
4848
testing-farm request --pipeline-type="tmt-multihost" \
4949
--plan-filter="tag:playbooks_parallel" \
50-
--git-url "https://github.com/<my_user>/template" \
50+
--git-url "https://github.com/<my_user>/trustee_attestation_server" \
5151
--git-ref "<my_branch>" \
5252
--compose CentOS-Stream-9 \
5353
-e "SYSTEM_ROLES_ONLY_TESTS=tests_default.yml" \

0 commit comments

Comments
 (0)