From 9c3c6d793f35fb579805fc1c29309a69c43c8efd Mon Sep 17 00:00:00 2001 From: Yi He Date: Wed, 10 Apr 2024 20:16:38 +0800 Subject: [PATCH] d --- .github/workflows/rhel-9-4.yaml | 428 ++------------------------------ ostree-8-to-9.sh | 5 + ostree-ami-image.sh | 1 - setup.sh | 6 + tmt/plans/edge-test.fmf | 91 ++++--- tmt/tests/test.sh | 3 +- 6 files changed, 91 insertions(+), 443 deletions(-) diff --git a/.github/workflows/rhel-9-4.yaml b/.github/workflows/rhel-9-4.yaml index 4708e89..319836d 100644 --- a/.github/workflows/rhel-9-4.yaml +++ b/.github/workflows/rhel-9-4.yaml @@ -1,5 +1,5 @@ --- -name: rhel94 test +name: Run Edge Test on RHEL 9.4.0 on: issue_comment: @@ -9,22 +9,7 @@ on: 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-fdo-db') || - 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')) }} + (endsWith(github.event.comment.body, '/test-rhel-9-4')) }} runs-on: ubuntu-latest steps: - name: Query author repository permissions @@ -56,11 +41,9 @@ jobs: ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }} repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }} - edge-commit-94: + edge-rhel-94-x86: 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')) }} + if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }} continue-on-error: true runs-on: ubuntu-latest @@ -72,7 +55,7 @@ jobs: fetch-depth: 0 - name: Run the tests - uses: sclorg/testing-farm-as-github-action@v1 + uses: sclorg/testing-farm-as-github-action@v2 with: compose: RHEL-9.4.0-Nightly arch: x86_64 @@ -80,16 +63,16 @@ jobs: 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" + pull_request_status_name: "edge-rhel-9.4-x86" + tmt_plan_regex: edge-x86 tf_scope: private - tmt_plan_regex: edge-commit - secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" + 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 }}" + variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1" + timeout: 180 - edge-installer: + edge-rhel-94-arm: 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')) }} + if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }} continue-on-error: true runs-on: ubuntu-latest @@ -101,94 +84,7 @@ jobs: 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 + uses: sclorg/testing-farm-as-github-action@v2 with: compose: RHEL-9.4.0-Nightly arch: aarch64 @@ -196,297 +92,9 @@ jobs: 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-fdo-db-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-db')) }} - 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-db-9.4" - tf_scope: private - tmt_plan_regex: edge-fdo-db - 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" + pull_request_status_name: "edge-rhel-9.4-arm" + tmt_plan_regex: edge-arm tf_scope: private - tmt_plan_regex: edge-9to9 - secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }}" + 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 }}" + variables: "ARCH=aarch64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1" + timeout: 180 diff --git a/ostree-8-to-9.sh b/ostree-8-to-9.sh index 4e511c3..b6a8dc3 100755 --- a/ostree-8-to-9.sh +++ b/ostree-8-to-9.sh @@ -639,4 +639,9 @@ check_result # Final success clean up clean_up +# Check process +greenprint "🛃 Checking for leftover or orphaned process" +sudo ps axjf +sudo pstree -pal + exit 0 diff --git a/ostree-ami-image.sh b/ostree-ami-image.sh index 48b2074..6542e05 100755 --- a/ostree-ami-image.sh +++ b/ostree-ami-image.sh @@ -84,7 +84,6 @@ get_compose_metadata () { # Move the JSON file into place. sudo cat "${TEMPDIR}"/"${COMPOSE_ID}".json | jq -M '.' | tee "$METADATA_FILE" > /dev/null - sudo chown admin:admin "${TEMPDIR}"/"${COMPOSE_ID}".json } # Build ostree image. diff --git a/setup.sh b/setup.sh index fb338ee..f733b12 100755 --- a/setup.sh +++ b/setup.sh @@ -232,3 +232,9 @@ sudo composer-cli sources list for SOURCE in $(sudo composer-cli sources list); do sudo composer-cli sources info "$SOURCE" done + +# In case port 8081 is already in use +sudo dnf install -y lsof +if lsof -nP -iTCP -sTCP:LISTEN|grep 8081; then + sudo fuser -k 8081/tcp +fi diff --git a/tmt/plans/edge-test.fmf b/tmt/plans/edge-test.fmf index fa4e848..ffa2d09 100644 --- a/tmt/plans/edge-test.fmf +++ b/tmt/plans/edge-test.fmf @@ -1,4 +1,4 @@ -summary: Edge commit test +summary: Edge test plan discover: how: fmf test: edge-test @@ -6,71 +6,100 @@ execute: how: tmt provision: hardware: - memory: ">= 16 GB" virtualization: is-supported: true + cpu: + processors: ">= 2" + memory: ">= 6 GB" -/edge-commit: +/edge-x86-commit: summary: Test edge commit environment+: TEST_CASE: edge-commit + adjust+: + - when: arch != x86_64 + enabled: false -/edge-installer: +/edge-x86-installer: summary: Test edge installer image environment+: TEST_CASE: edge-installer + adjust+: + - when: arch != x86_64 + enabled: false -/edge-raw-image: +/edge-x86-raw-image: summary: Test edge raw image environment+: TEST_CASE: edge-raw-image + adjust+: + - when: arch != x86_64 + enabled: false -/edge-ami-image: - summary: Test edge ami image - environment+: - TEST_CASE: edge-ami-image - -/edge-simplified-installer: +/edge-x86-simplified-installer: summary: Test edge simplified installer image environment+: TEST_CASE: edge-simplified-installer + adjust+: + - when: arch != x86_64 + enabled: false -/edge-minimal: - summary: Test edge minimal raw image - environment+: - TEST_CASE: edge-minimal - -/edge-vsphere: - summary: Test edge vsphere image - environment+: - TEST_CASE: edge-vsphere - -/edge-fdo-aio: +/edge-x86-fdo-aio: summary: Test edge with fdo aio service environment+: TEST_CASE: edge-fdo-aio + adjust+: + - when: arch != x86_64 + enabled: false -/edge-fdo-db: +/edge-x86-fdo-db: summary: Test edge with fdo package with db environment+: TEST_CASE: edge-fdo-db + adjust+: + - when: arch != x86_64 + enabled: false -/edge-ignition: +/edge-x86-ignition: summary: Test edge ignition feature environment+: TEST_CASE: edge-ignition + adjust+: + - when: arch != x86_64 + enabled: false -/edge-pulp: +/edge-x86-pulp: summary: Test edge pulp feature environment+: TEST_CASE: edge-pulp + adjust+: + - when: arch != x86_64 + enabled: false -/edge-8to9: - summary: Test edge upgrade from 8 to 9 +/edge-x86-vsphere: + summary: Test edge vsphere image environment+: - TEST_CASE: edge-8to9 + TEST_CASE: edge-vsphere + adjust+: + - when: arch != x86_64 + enabled: false -/edge-9to9: - summary: Test edge rebase from 9 to 9 +/edge-x86-ami-image: + summary: Test edge ami image + environment+: + TEST_CASE: edge-ami-image + +/edge-x86-minimal: + summary: Test edge minimal raw image + environment+: + TEST_CASE: edge-minimal + +/edge-arm-ami-image: + summary: Test edge ami image + environment+: + TEST_CASE: edge-ami-image + +/edge-arm-minimal: + summary: Test edge minimal raw image environment+: - TEST_CASE: edge-9to9 + TEST_CASE: edge-minimal \ No newline at end of file diff --git a/tmt/tests/test.sh b/tmt/tests/test.sh index 38668cf..09f87c1 100755 --- a/tmt/tests/test.sh +++ b/tmt/tests/test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -euox pipefail cd ../../ || exit 1 @@ -6,7 +7,7 @@ function run_tests() { if [ "$TEST_CASE" = "edge-commit" ]; then ./ostree.sh elif [ "$TEST_CASE" = "edge-installer" ]; then - ./ostree-installer.sh + ./ostree-ng.sh elif [ "$TEST_CASE" = "edge-raw-image" ]; then ./ostree-raw-image.sh elif [ "$TEST_CASE" = "edge-ami-image" ]; then