Skip to content

Commit f73dddd

Browse files
authored
ci: In test plans, prefix all relate variables with SR_ (#134)
Signed-off-by: Sergei Petrosian <spetrosi@redhat.com>
1 parent a5e47ef commit f73dddd

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
matrix:
2121
pyver_os:
2222
- ver: "2.7"
23-
os: ubuntu-20.04
24-
- ver: "3.6"
25-
os: ubuntu-20.04
23+
os: ubuntu-22.04
2624
- ver: "3.8"
2725
os: ubuntu-latest
2826
- ver: "3.9"

.github/workflows/tft.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,20 @@ jobs:
118118
ARTIFACTS_DIR_NAME: "tf_${{ github.event.repository.name }}-${{ github.event.issue.number }}_\
119119
${{ matrix.platform }}-${{ matrix.ansible_version }}_\
120120
${{ needs.prepare_vars.outputs.datetime }}/artifacts"
121-
ARTIFACT_TARGET_DIR: /srv/pub/alt/${{ vars.LINUXSYSTEMROLES_USER }}/logs
121+
ARTIFACT_TARGET_DIR: /srv/pub/alt/${{ vars.SR_LSR_USER }}/logs
122122
steps:
123123
- name: Set variables with DATETIME and artifact location
124124
id: set_vars
125125
run: |
126126
printf -v DATETIME '%(%Y%m%d-%H%M%S)T' -1
127127
ARTIFACTS_DIR_NAME="tf_${{ github.event.repository.name }}-${{ github.event.issue.number }}_\
128128
${{ matrix.platform }}-${{ matrix.ansible_version }}_$DATETIME/artifacts"
129-
ARTIFACTS_TARGET_DIR=/srv/pub/alt/${{ vars.LINUXSYSTEMROLES_USER }}/logs
129+
ARTIFACTS_TARGET_DIR=/srv/pub/alt/${{ vars.SR_LSR_USER }}/logs
130130
ARTIFACTS_DIR=$ARTIFACTS_TARGET_DIR/$ARTIFACTS_DIR_NAME
131-
ARTIFACTS_URL=https://dl.fedoraproject.org/pub/alt/${{ vars.LINUXSYSTEMROLES_USER }}/logs/$ARTIFACTS_DIR_NAME
131+
ARTIFACTS_URL=https://dl.fedoraproject.org/pub/alt/${{ vars.SR_LSR_USER }}/logs/$ARTIFACTS_DIR_NAME
132132
echo "DATETIME=$DATETIME" >> $GITHUB_OUTPUT
133-
echo "ARTIFACTS_DIR=$ARTIFACTS_DIR" >> $GITHUB_OUTPUT
134-
echo "ARTIFACTS_URL=$ARTIFACTS_URL" >> $GITHUB_OUTPUT
133+
echo "SR_ARTIFACTS_DIR=$SR_ARTIFACTS_DIR" >> $GITHUB_OUTPUT
134+
echo "SR_ARTIFACTS_URL=$SR_ARTIFACTS_URL" >> $GITHUB_OUTPUT
135135
136136
- name: Set commit status as pending
137137
if: contains(needs.prepare_vars.outputs.supported_platforms, matrix.platform)
@@ -160,18 +160,18 @@ jobs:
160160
git_ref: main
161161
pipeline_settings: '{ "type": "tmt-multihost" }'
162162
environment_settings: '{ "provisioning": { "tags": { "BusinessUnit": "system_roles" } } }'
163-
# Keeping ARTIFACTS_URL at the bottom makes the link in logs clickable
164-
variables: "ANSIBLE_VER=${{ matrix.ansible_version }};\
165-
REPO_NAME=${{ github.event.repository.name }};\
166-
GITHUB_ORG=${{ github.repository_owner }};\
167-
PR_NUM=${{ github.event.issue.number }};\
168-
ARTIFACTS_DIR=${{ steps.set_vars.outputs.ARTIFACTS_DIR }};\
169-
TEST_LOCAL_CHANGES=false;\
170-
LINUXSYSTEMROLES_USER=${{ vars.LINUXSYSTEMROLES_USER }};\
171-
ARTIFACTS_URL=${{ steps.set_vars.outputs.ARTIFACTS_URL }}"
163+
# Keeping SR_ARTIFACTS_URL at the bottom makes the link in logs clickable
164+
variables: "SR_ANSIBLE_VER=${{ matrix.ansible_version }};\
165+
SR_REPO_NAME=${{ github.event.repository.name }};\
166+
SR_GITHUB_ORG=${{ github.repository_owner }};\
167+
SR_PR_NUM=${{ github.event.issue.number }};\
168+
SR_ARTIFACTS_DIR=${{ steps.set_vars.outputs.SR_ARTIFACTS_DIR }};\
169+
SR_TEST_LOCAL_CHANGES=false;\
170+
SR_LSR_USER=${{ vars.SR_LSR_USER }};\
171+
SR_ARTIFACTS_URL=${{ steps.set_vars.outputs.SR_ARTIFACTS_URL }}"
172172
# Note that LINUXSYSTEMROLES_SSH_KEY must be single-line, TF doesn't read multi-line variables fine.
173-
secrets: "LINUXSYSTEMROLES_DOMAIN=${{ secrets.LINUXSYSTEMROLES_DOMAIN }};\
174-
LINUXSYSTEMROLES_SSH_KEY=${{ secrets.LINUXSYSTEMROLES_SSH_KEY }}"
173+
secrets: "SR_LSR_DOMAIN=${{ secrets.SR_LSR_DOMAIN }};\
174+
SR_LSR_SSH_KEY=${{ secrets.SR_LSR_SSH_KEY }}"
175175
compose: ${{ matrix.platform }}
176176
# There are two blockers for using public ranch:
177177
# 1. multihost is not supported in public https://github.com/teemtee/tmt/issues/2620
@@ -189,4 +189,4 @@ jobs:
189189
status: ${{ job.status }}
190190
context: ${{ matrix.platform }}|ansible-${{ matrix.ansible_version }}
191191
description: Test finished
192-
targetUrl: ${{ steps.set_vars.outputs.ARTIFACTS_URL }}
192+
targetUrl: ${{ steps.set_vars.outputs.SR_ARTIFACTS_URL }}

plans/test_playbooks_parallel.fmf

+15-12
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,22 @@ provision:
1212
- name: managed-node1
1313
role: managed_node
1414
connection: system
15+
- name: managed-node2
16+
role: managed_node
17+
connection: system
1518
environment:
16-
ANSIBLE_VER: 2.17
17-
REPO_NAME: bootloader
18-
PYTHON_VERSION: 3.12
19-
SYSTEM_ROLES_ONLY_TESTS: "" # tests_default.yml
20-
TEST_LOCAL_CHANGES: true
21-
PR_NUM: ""
22-
LINUXSYSTEMROLES_USER: ""
23-
LINUXSYSTEMROLES_DOMAIN: ""
24-
LINUXSYSTEMROLES_SSH_KEY: ""
25-
ARTIFACTS_DIR: ""
26-
ARTIFACTS_URL: ""
27-
LSR_TFT_DEBUG: false
19+
SR_ANSIBLE_VER: 2.17
20+
SR_REPO_NAME: bootloader
21+
SR_PYTHON_VERSION: 3.12
22+
SR_ONLY_TESTS: "" # tests_default.yml
23+
SR_TEST_LOCAL_CHANGES: true
24+
SR_PR_NUM: ""
25+
SR_LSR_USER: ""
26+
SR_LSR_DOMAIN: ""
27+
SR_LSR_SSH_KEY: ""
28+
SR_ARTIFACTS_DIR: ""
29+
SR_ARTIFACTS_URL: ""
30+
SR_TFT_DEBUG: false
2831
prepare:
2932
- name: Use vault.centos.org repos (CS 7, 8 EOL workaround)
3033
script: |

0 commit comments

Comments
 (0)