marko/ansible-role-aide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: In test plans, prefix all relate variables with SR_

Browse Source 
Signed-off-by: Sergei Petrosian <spetrosi@redhat.com>
This commit is contained in:
Sergei Petrosian
2025-03-19 17:32:04 +01:00
committed by Sergei Petrosian
parent 826f2fc0fa
commit 9649b57c78
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/tft.yml
+17 -17
View File
@@ -118,7 +118,7 @@ jobs:
ARTIFACTS_DIR_NAME: "tf_${{ github.event.repository.name }}-${{ github.event.issue.number }}_\ ARTIFACTS_DIR_NAME: "tf_${{ github.event.repository.name }}-${{ github.event.issue.number }}_\
${{ matrix.platform }}-${{ matrix.ansible_version }}_\ ${{ matrix.platform }}-${{ matrix.ansible_version }}_\
${{ needs.prepare_vars.outputs.datetime }}/artifacts" ${{ needs.prepare_vars.outputs.datetime }}/artifacts"
ARTIFACT_TARGET_DIR: /srv/pub/alt/${{ vars.LINUXSYSTEMROLES_USER }}/logs ARTIFACT_TARGET_DIR: /srv/pub/alt/${{ vars.SR_LSR_USER }}/logs
steps: steps:
- name: Set variables with DATETIME and artifact location - name: Set variables with DATETIME and artifact location
id: set_vars id: set_vars
@@ -126,12 +126,12 @@ jobs:
printf -v DATETIME '%(%Y%m%d-%H%M%S)T' -1 printf -v DATETIME '%(%Y%m%d-%H%M%S)T' -1
ARTIFACTS_DIR_NAME="tf_${{ github.event.repository.name }}-${{ github.event.issue.number }}_\ ARTIFACTS_DIR_NAME="tf_${{ github.event.repository.name }}-${{ github.event.issue.number }}_\
${{ matrix.platform }}-${{ matrix.ansible_version }}_$DATETIME/artifacts" ${{ matrix.platform }}-${{ matrix.ansible_version }}_$DATETIME/artifacts"
ARTIFACTS_TARGET_DIR=/srv/pub/alt/${{ vars.LINUXSYSTEMROLES_USER }}/logs ARTIFACTS_TARGET_DIR=/srv/pub/alt/${{ vars.SR_LSR_USER }}/logs
ARTIFACTS_DIR=$ARTIFACTS_TARGET_DIR/$ARTIFACTS_DIR_NAME ARTIFACTS_DIR=$ARTIFACTS_TARGET_DIR/$ARTIFACTS_DIR_NAME
ARTIFACTS_URL=https://dl.fedoraproject.org/pub/alt/${{ vars.LINUXSYSTEMROLES_USER }}/logs/$ARTIFACTS_DIR_NAME ARTIFACTS_URL=https://dl.fedoraproject.org/pub/alt/${{ vars.SR_LSR_USER }}/logs/$ARTIFACTS_DIR_NAME
echo "DATETIME=$DATETIME" >> $GITHUB_OUTPUT echo "DATETIME=$DATETIME" >> $GITHUB_OUTPUT
echo "ARTIFACTS_DIR=$ARTIFACTS_DIR" >> $GITHUB_OUTPUT echo "SR_ARTIFACTS_DIR=$SR_ARTIFACTS_DIR" >> $GITHUB_OUTPUT
echo "ARTIFACTS_URL=$ARTIFACTS_URL" >> $GITHUB_OUTPUT echo "SR_ARTIFACTS_URL=$SR_ARTIFACTS_URL" >> $GITHUB_OUTPUT
- name: Set commit status as pending - name: Set commit status as pending
if: contains(needs.prepare_vars.outputs.supported_platforms, matrix.platform) if: contains(needs.prepare_vars.outputs.supported_platforms, matrix.platform)
@@ -160,18 +160,18 @@ jobs:
git_ref: main git_ref: main
pipeline_settings: '{ "type": "tmt-multihost" }' pipeline_settings: '{ "type": "tmt-multihost" }'
environment_settings: '{ "provisioning": { "tags": { "BusinessUnit": "system_roles" } } }' environment_settings: '{ "provisioning": { "tags": { "BusinessUnit": "system_roles" } } }'
# Keeping ARTIFACTS_URL at the bottom makes the link in logs clickable # Keeping SR_ARTIFACTS_URL at the bottom makes the link in logs clickable
variables: "ANSIBLE_VER=${{ matrix.ansible_version }};\ variables: "SR_ANSIBLE_VER=${{ matrix.ansible_version }};\
REPO_NAME=${{ github.event.repository.name }};\ SR_REPO_NAME=${{ github.event.repository.name }};\
GITHUB_ORG=${{ github.repository_owner }};\ SR_GITHUB_ORG=${{ github.repository_owner }};\
PR_NUM=${{ github.event.issue.number }};\ SR_PR_NUM=${{ github.event.issue.number }};\
ARTIFACTS_DIR=${{ steps.set_vars.outputs.ARTIFACTS_DIR }};\ SR_ARTIFACTS_DIR=${{ steps.set_vars.outputs.SR_ARTIFACTS_DIR }};\
TEST_LOCAL_CHANGES=false;\ SR_TEST_LOCAL_CHANGES=false;\
LINUXSYSTEMROLES_USER=${{ vars.LINUXSYSTEMROLES_USER }};\ SR_LSR_USER=${{ vars.SR_LSR_USER }};\
ARTIFACTS_URL=${{ steps.set_vars.outputs.ARTIFACTS_URL }}" SR_ARTIFACTS_URL=${{ steps.set_vars.outputs.SR_ARTIFACTS_URL }}"
# Note that LINUXSYSTEMROLES_SSH_KEY must be single-line, TF doesn't read multi-line variables fine. # Note that LINUXSYSTEMROLES_SSH_KEY must be single-line, TF doesn't read multi-line variables fine.
secrets: "LINUXSYSTEMROLES_DOMAIN=${{ secrets.LINUXSYSTEMROLES_DOMAIN }};\ secrets: "SR_LSR_DOMAIN=${{ secrets.SR_LSR_DOMAIN }};\
LINUXSYSTEMROLES_SSH_KEY=${{ secrets.LINUXSYSTEMROLES_SSH_KEY }}" SR_LSR_SSH_KEY=${{ secrets.SR_LSR_SSH_KEY }}"
compose: ${{ matrix.platform }} compose: ${{ matrix.platform }}
# There are two blockers for using public ranch: # There are two blockers for using public ranch:
# 1. multihost is not supported in public https://github.com/teemtee/tmt/issues/2620 # 1. multihost is not supported in public https://github.com/teemtee/tmt/issues/2620
@@ -189,4 +189,4 @@ jobs:
status: ${{ job.status }} status: ${{ job.status }}
context: ${{ matrix.platform }}|ansible-${{ matrix.ansible_version }} context: ${{ matrix.platform }}|ansible-${{ matrix.ansible_version }}
description: Test finished description: Test finished
targetUrl: ${{ steps.set_vars.outputs.ARTIFACTS_URL }} targetUrl: ${{ steps.set_vars.outputs.SR_ARTIFACTS_URL }}
plans/test_playbooks_parallel.fmf
+15 -12
View File
@@ -12,19 +12,22 @@ provision:
- name: managed-node1 - name: managed-node1
role: managed_node role: managed_node
connection: system connection: system
- name: managed-node2
role: managed_node
connection: system
environment: environment:
ANSIBLE_VER: 2.17 SR_ANSIBLE_VER: 2.17
REPO_NAME: aide SR_REPO_NAME: aide
PYTHON_VERSION: 3.12 SR_PYTHON_VERSION: 3.12
SYSTEM_ROLES_ONLY_TESTS: "" # tests_default.yml SR_ONLY_TESTS: "" # tests_default.yml
TEST_LOCAL_CHANGES: true SR_TEST_LOCAL_CHANGES: true
PR_NUM: "" SR_PR_NUM: ""
LINUXSYSTEMROLES_USER: "" SR_LSR_USER: ""
LINUXSYSTEMROLES_DOMAIN: "" SR_LSR_DOMAIN: ""
LINUXSYSTEMROLES_SSH_KEY: "" SR_LSR_SSH_KEY: ""
ARTIFACTS_DIR: "" SR_ARTIFACTS_DIR: ""
ARTIFACTS_URL: "" SR_ARTIFACTS_URL: ""
LSR_TFT_DEBUG: false SR_TFT_DEBUG: false
prepare: prepare:
- name: Use vault.centos.org repos (CS 7, 8 EOL workaround) - name: Use vault.centos.org repos (CS 7, 8 EOL workaround)
script: | script: |