diff --git a/.github/workflows/test-workflow.yaml b/.github/workflows/test-workflow.yaml index 558077e..d7e8f35 100644 --- a/.github/workflows/test-workflow.yaml +++ b/.github/workflows/test-workflow.yaml @@ -5,54 +5,6 @@ on: workflow_dispatch jobs: -# pr-info: -# if: ${{ github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-commit') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-installer') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-raw') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-ami') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-arm-ami') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-simplified') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-minimal') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-arm-minimal') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-vsphere') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-fdo-aio') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-ignition') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-pulp') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-8to9') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-9to9')) }} -# runs-on: ubuntu-latest -# steps: -# - name: Query author repository permissions -# uses: octokit/request-action@v2.x -# id: user_permission -# with: -# route: GET /repos/${{ github.repository }}/collaborators/${{ github.event.sender.login }}/permission -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# -# - name: Check if user does have correct permissions -# if: contains('admin write', fromJson(steps.user_permission.outputs.data).permission) -# id: check_user_perm -# run: | -# echo "User '${{ github.event.sender.login }}' has permission '${{ fromJson(steps.user_permission.outputs.data).permission }}' allowed values: 'admin', 'write'" -# echo "allowed_user=true" >> $GITHUB_OUTPUT -# -# - name: Get information for pull request -# uses: octokit/request-action@v2.x -# id: pr-api -# with: -# route: GET /repos/${{ github.repository }}/pulls/${{ github.event.issue.number }} -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# -# outputs: -# allowed_user: ${{ steps.check_user_perm.outputs.allowed_user }} -# sha: ${{ fromJson(steps.pr-api.outputs.data).head.sha }} -# ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }} -# repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }} -# edge-test: continue-on-error: true runs-on: ubuntu-latest @@ -78,408 +30,3 @@ jobs: tmt_plan_regex: edge-test secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# edge-commit-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-commit')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-commit-9.4" -# tf_scope: private -# tmt_plan_regex: edge-commit -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-installer: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-installer')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-installer-9.4" -# tf_scope: private -# tmt_plan_regex: edge-installer -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }}" -# -# edge-raw-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-raw')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-raw-image-9.4" -# tf_scope: private -# tmt_plan_regex: edge-raw-image -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }}" -# -# edge-ami-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-ami')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-ami-9.4" -# tf_scope: private -# tmt_plan_regex: edge-ami-image -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};AWS_DEFAULT_REGION=us-east-1" -# -# edge-arm-ami-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-arm-ami')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-arm-ami-9.4" -# tf_scope: private -# tmt_plan_regex: edge-ami-image -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};AWS_DEFAULT_REGION=us-east-1" -# -# edge-simplified-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-simplified')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-simplified-9.4" -# tf_scope: private -# tmt_plan_regex: edge-simplified-installer -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-minimal-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-minimal')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-minimal-9.4" -# tf_scope: private -# tmt_plan_regex: edge-minimal -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-arm-minimal-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-arm-minimal')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-arm-minimal-9.4" -# tf_scope: private -# tmt_plan_regex: edge-minimal -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-vsphere-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-vsphere')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-vsphere-9.4" -# tf_scope: private -# tmt_plan_regex: edge-vsphere -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }};GOVC_INSECURE=1" -# -# edge-fdo-aio-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-fdo-aio')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-fdo-aio-9.4" -# tf_scope: private -# tmt_plan_regex: edge-fdo-aio -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-ignition-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-ignition')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-ignition-9.4" -# tf_scope: private -# tmt_plan_regex: edge-ignition -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-pulp-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-pulp')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-pulp-9.4" -# tf_scope: private -# tmt_plan_regex: edge-pulp -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-8to9-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-8to9')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-8to9-9.4" -# tf_scope: private -# tmt_plan_regex: edge-8to9 -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" -# -# edge-9to9-94: -# needs: pr-info -# if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && -# (endsWith(github.event.comment.body, '/test-rhel-9-4') || -# endsWith(github.event.comment.body, '/test-rhel-9-4-9to9')) }} -# continue-on-error: true -# runs-on: ubuntu-latest -# -# steps: -# - name: Clone repository -# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 -# with: -# ref: ${{ needs.pr-info.outputs.sha }} -# fetch-depth: 0 -# -# - name: Run the tests -# uses: sclorg/testing-farm-as-github-action@v1 -# with: -# compose: RHEL-9.4.0-Nightly -# 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: "edge-9to9-9.4" -# tf_scope: private -# tmt_plan_regex: edge-9to9 -# secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" diff --git a/ostree-mcattamo.sh b/ostree-mcattamo.sh new file mode 100755 index 0000000..c9cd05e --- /dev/null +++ b/ostree-mcattamo.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -exuo pipefail + +cat /etc/os-release + +exit 0 diff --git a/tmt/plans/edge-test.fmf b/tmt/plans/edge-test.fmf index 7bdea5c..bd6c33c 100644 --- a/tmt/plans/edge-test.fmf +++ b/tmt/plans/edge-test.fmf @@ -9,10 +9,10 @@ provision: virtualization: is-supported: true -/edge-test: - summary: Test edge test +/edge-mcattamo: + summary: Test edge mcattamo test environment+: - TEST_CASE: edge-test + TEST_CASE: edge-mcattamo /edge-commit: summary: Test edge commit diff --git a/tmt/tests/test.sh b/tmt/tests/test.sh index d5df1e2..b08d902 100755 --- a/tmt/tests/test.sh +++ b/tmt/tests/test.sh @@ -3,8 +3,8 @@ cd ../../ || exit 1 function run_tests() { - if [ "$TEST_CASE" = "edge-test" ]; then - ./ostree-test.sh + if [ "$TEST_CASE" = "edge-mcattamo" ]; then + ./ostree-mcattamo.sh elif [ "$TEST_CASE" = "edge-commit" ]; then ./ostree.sh elif [ "$TEST_CASE" = "edge-installer" ]; then