From ff75ed0f0f359abf55dd2828d729e9cae45a0af7 Mon Sep 17 00:00:00 2001 From: Mario Cattamo Date: Thu, 23 May 2024 17:19:16 +0200 Subject: [PATCH] test: define context githubaction --- .github/workflows/fedora-39.yml | 4 ++-- tmt/plans/edge-test.fmf | 20 +++++--------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/fedora-39.yml b/.github/workflows/fedora-39.yml index 15416e7..23f1a1a 100644 --- a/.github/workflows/fedora-39.yml +++ b/.github/workflows/fedora-39.yml @@ -58,12 +58,12 @@ jobs: uses: sclorg/testing-farm-as-github-action@v2 with: compose: Fedora-39-Updated - arch: x86_64 api_key: ${{ secrets.TF_API_KEY }} git_url: ${{ needs.pr-info.outputs.repo_url }} git_ref: ${{ needs.pr-info.outputs.ref }} update_pull_request_status: true pull_request_status_name: "iot-f39-x86" + tmt_context: "arch=x86_64;distro=fedora" tmt_plan_regex: edge-x86 tf_scope: private secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}" @@ -86,12 +86,12 @@ jobs: uses: sclorg/testing-farm-as-github-action@v2 with: compose: Fedora-39-Updated - arch: aarch64 api_key: ${{ secrets.TF_API_KEY }} git_url: ${{ needs.pr-info.outputs.repo_url }} git_ref: ${{ needs.pr-info.outputs.ref }} update_pull_request_status: true pull_request_status_name: "iot-f39-arm" + tmt_context: "arch=aarch64;distro=fedora" tmt_plan_regex: edge-arm tf_scope: private secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}" diff --git a/tmt/plans/edge-test.fmf b/tmt/plans/edge-test.fmf index 3c14fa2..dd934c6 100644 --- a/tmt/plans/edge-test.fmf +++ b/tmt/plans/edge-test.fmf @@ -49,9 +49,7 @@ provision: environment+: TEST_CASE: edge-fdo-aio adjust+: - - when: arch != x86_64 - enabled: false - - when: distro == fedora + - when: arch != x86_64 or distro == fedora enabled: false /edge-x86-fdo-db: @@ -59,9 +57,7 @@ provision: environment+: TEST_CASE: edge-fdo-db adjust+: - - when: arch != x86_64 - enabled: false - - when: distro == fedora + - when: arch != x86_64 or distro == fedora enabled: false /edge-x86-ignition: @@ -69,9 +65,7 @@ provision: environment+: TEST_CASE: edge-ignition adjust+: - - when: arch != x86_64 - enabled: false - - when: distro == fedora + - when: arch != x86_64 or distro == fedora enabled: false /edge-x86-pulp: @@ -79,9 +73,7 @@ provision: environment+: TEST_CASE: edge-pulp adjust+: - - when: arch != x86_64 - enabled: false - - when: distro == fedora + - when: arch != x86_64 or distro == fedora enabled: false /edge-x86-vsphere: @@ -89,9 +81,7 @@ provision: environment+: TEST_CASE: edge-vsphere adjust+: - - when: arch != x86_64 - enabled: false - - when: distro == fedora + - when: arch != x86_64 or distro == fedora enabled: false /edge-x86-ami-image: