Skip to content

Commit 05db4cb

Browse files
phracekphracek
authored
Merge pull request #77 from sclorg/fix_ci_plans
Rename testing plan to centos-stream-10-plan
2 parents de85fbf + ceded8e commit 05db4cb

File tree

5 files changed

+94
-95
lines changed

5 files changed

+94
-95
lines changed

‎.github/workflows/rpm-check.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939
compose: "Fedora-41"
4040
tmt_hardware: '{"gpu": {"device-name": "GH100 (H100)", "vendor-name": "NVIDIA"}}'
4141
hardware: "GH100"
42-
- os: "c9s"
42+
- os: "centos-stream-9-plan"
4343
context: "CentOS Stream 9"
4444
compose: "CentOS-Stream-9"
4545
tmt_hardware: ""
4646
hardware: ""
47-
- os: "c10s"
47+
- os: "centos-stream-10-plan"
4848
context: "CentOS Stream 10"
4949
compose: "CentOS-Stream-10"
5050
tmt_hardware: ""
@@ -69,7 +69,6 @@ jobs:
6969
git_url: "https://github.com/sclorg/sclorg-testing-farm"
7070
git_ref: "main"
7171
tf_scope: "public"
72-
tmt_context: "trigger=code"
7372
tmt_plan_regex: "${{ matrix.os }}"
7473
tmt_hardware: "${{ matrix.tmt_hardware }}"
7574
update_pull_request_status: true

‎plans/c10s.fmf‎

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ summary: TMT/TFT plan for running container tests on CentOS Stream 10
22
description: |
33
Run container tests on CentOS Stream 10
44

5+
discover:
6+
how: shell
7+
tests:
8+
- name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
9+
framework: shell
10+
test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
11+
duration: 3h
12+
513
prepare:
614
- name: Clone repository and switch to corresponding PR
715
how: shell
@@ -13,51 +21,11 @@ prepare:
1321
git checkout origin/pr/$PR_NUMBER/head
1422
git submodule update --init
1523

24+
- name: Enable repositories and prepare machine for tests
25+
how: ansible
26+
playbook:
27+
- tmt-testing-plan-c10s.yml
28+
extra-vars: -vv
29+
1630
execute:
1731
how: tmt
18-
19-
/test-ci:
20-
enabled: true
21-
adjust:
22-
- because: "Plan to be ran when either executed locally, or executed by CI system"
23-
when: >-
24-
trigger is defined
25-
and trigger == code
26-
enabled: false
27-
prepare+:
28-
- name: Enable repositories and prepare machine for tests
29-
how: ansible
30-
playbook:
31-
- tmt-testing-plan-c10s.yml
32-
extra-vars: -vvv
33-
discover:
34-
how: shell
35-
tests:
36-
- name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
37-
framework: shell
38-
test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
39-
duration: 3h
40-
41-
42-
/test-plan:
43-
enabled: false
44-
adjust:
45-
- because: "Plan to be ran for checking if packages and files are present as we want"
46-
when: >-
47-
trigger is defined
48-
and trigger == code
49-
enabled: true
50-
prepare+:
51-
- name: Enable repositories and prepare machine for tests
52-
how: shell
53-
script: |
54-
cd /root/$REPO_NAME
55-
git status
56-
ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c10s.yml -vvv
57-
discover:
58-
how: shell
59-
tests:
60-
- name: Run sclorg-testing-farm tests
61-
framework: shell
62-
test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
63-
duration: 1h

‎plans/c9s.fmf‎

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ summary: TMT/TFT plan for running container tests on CentOS Stream 9
22
description: |
33
Run container tests on CentOS Stream 9
44

5+
discover:
6+
how: shell
7+
tests:
8+
- name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
9+
framework: shell
10+
test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
11+
duration: 3h
12+
513
prepare:
614
- name: Clone repository and switch to corresponding PR
715
how: shell
@@ -13,51 +21,11 @@ prepare:
1321
git checkout origin/pr/$PR_NUMBER/head
1422
git submodule update --init
1523

24+
- name: Enable repositories and prepare machine for tests
25+
how: ansible
26+
playbook:
27+
- tmt-testing-plan-c9s.yml
28+
extra-vars: -vv
29+
1630
execute:
1731
how: tmt
18-
19-
/test-ci:
20-
enabled: true
21-
adjust:
22-
- because: "Plan to be ran when either executed locally, or executed by CI system"
23-
when: >-
24-
trigger is defined
25-
and trigger == code
26-
enabled: false
27-
prepare+:
28-
- name: Enable repositories and prepare machine for tests
29-
how: ansible
30-
playbook:
31-
- tmt-testing-plan-c9s.yml
32-
extra-vars: -vvv
33-
discover:
34-
how: shell
35-
tests:
36-
- name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
37-
framework: shell
38-
test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
39-
duration: 3h
40-
41-
42-
/test-plan:
43-
enabled: false
44-
adjust:
45-
- because: "Plan to be ran for checking if packages and files are present as we want"
46-
when: >-
47-
trigger is defined
48-
and trigger == code
49-
enabled: true
50-
prepare+:
51-
- name: Enable repositories and prepare machine for tests
52-
how: shell
53-
script: |
54-
cd /root/$REPO_NAME
55-
git status
56-
ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c9s.yml -vvv
57-
discover:
58-
how: shell
59-
tests:
60-
- name: Run sclorg-testing-farm tests
61-
framework: shell
62-
test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
63-
duration: 1h

‎plans/centos-stream-10-plan.fmf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
summary: TMT/TFT plan for running container tests on CentOS Stream 10
2+
description: |
3+
Run container tests on CentOS Stream 10
4+
5+
discover:
6+
how: shell
7+
tests:
8+
- name: Run sclorg-testing-farm tests
9+
framework: shell
10+
test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
11+
duration: 1h
12+
13+
prepare:
14+
- name: Clone repository and switch to corresponding PR
15+
how: shell
16+
script: |
17+
dnf install -y git ansible-core
18+
git clone $REPO_URL /root/$REPO_NAME
19+
cd /root/$REPO_NAME
20+
git fetch origin +refs/pull/*:refs/remotes/origin/pr/*
21+
git checkout origin/pr/$PR_NUMBER/head
22+
git submodule update --init
23+
24+
- name: Enable repositories and prepare machine for tests
25+
how: shell
26+
script: |
27+
cd /root/$REPO_NAME
28+
git status
29+
ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c10s.yml -vvv
30+
31+
execute:
32+
how: tmt

‎plans/centos-stream-9-plan.fmf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
summary: TMT/TFT plan for running container tests on CentOS Stream 9
2+
description: |
3+
Run container tests on CentOS Stream 9
4+
5+
discover:
6+
how: shell
7+
tests:
8+
- name: Run sclorg-testing-farm tests
9+
framework: shell
10+
test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
11+
duration: 1h
12+
13+
prepare:
14+
- name: Clone repository and switch to corresponding PR
15+
how: shell
16+
script: |
17+
dnf install -y git ansible
18+
git clone $REPO_URL /root/$REPO_NAME
19+
cd /root/$REPO_NAME
20+
git fetch origin +refs/pull/*:refs/remotes/origin/pr/*
21+
git checkout origin/pr/$PR_NUMBER/head
22+
git submodule update --init
23+
24+
- name: Enable repositories and prepare machine for tests
25+
how: shell
26+
script: |
27+
cd /root/$REPO_NAME
28+
git status
29+
ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c9s.yml -vvv
30+
31+
execute:
32+
how: tmt

0 commit comments

Comments
 (0)