d

yih-redhat · May 19, 2024 · 4d0a3b1 · 4d0a3b1
1 parent e7a89d1
commit 4d0a3b1
Show file tree

Hide file tree

Showing 7 changed files with 303 additions and 33 deletions.
diff --git a/.github/workflows/rhel-9-4-single.yaml b/.github/workflows/rhel-9-4-single.yaml
@@ -0,0 +1,168 @@
+# ---
+# name: Run Edge Test on RHEL 9.4.0
+
+# on:
+#   issue_comment:
+#     types:
+#       - created
+
+# jobs:
+#   pr-info:
+#     if: ${{ github.event.issue.pull_request &&
+#             (endsWith(github.event.comment.body, '/test-rhel-9-4')) }}
+#     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-rhel-94:
+#     needs: pr-info
+#     if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }}
+#     continue-on-error: true
+#     strategy:
+#       matrix:
+#         arch: [x86_64, aarch64]
+#     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@v2
+#         with:
+#           compose: RHEL-9.4.0-Nightly
+#           arch: ${{ matrix.arch }}
+#           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-rhel-9.4-${{ matrix.arch }}"
+#           tmt_context: "arch=${{ matrix.arch }};distro=rhel"
+#           tmt_plan_regex: edge-commit
+#           tf_scope: private
+#           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 }};AWS_DEFAULT_REGION=us-east-1;GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
+#           variables: "ARCH=${{ matrix.arch }};GOVC_INSECURE=1"
+
+---
+name: bib image Test
+
+on:
+  issue_comment:
+    types:
+      - created
+
+jobs:
+  pr-info:
+    if: ${{ github.event.issue.pull_request &&
+            (endsWith(github.event.comment.body, '/test-rhel95') ||
+            endsWith(github.event.comment.body, '/test-rhel95-bib-image') ||
+            endsWith(github.event.comment.body, '/test-rhel94') ||
+            endsWith(github.event.comment.body, '/test-rhel94-bib-image') ||
+            endsWith(github.event.comment.body, '/test-rhel9y-snapshot') ||
+            endsWith(github.event.comment.body, '/test-rhel9y-snapshot-bib-image') ||
+            endsWith(github.event.comment.body, '/test-cs9') ||
+            endsWith(github.event.comment.body, '/test-cs9-bib-image') ||
+            endsWith(github.event.comment.body, '/test-cs9-dev') ||
+            endsWith(github.event.comment.body, '/test-cs9-dev-bib-image') ||
+            endsWith(github.event.comment.body, '/test-fedora-40') ||
+            endsWith(github.event.comment.body, '/test-fedora-40-bib-image') ||
+            endsWith(github.event.comment.body, '/test-fedora-41') ||
+            endsWith(github.event.comment.body, '/test-fedora-41-bib-image')) }}
+    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 }}
+
+      # restrict running of tests to users with admin or write permission for the repository
+      # see https://docs.github.com/en/free-pro-team@latest/rest/reference/repos#get-repository-permissions-for-a-user
+      - 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 }}
+
+  rhel95-bib-image:
+    needs: pr-info
+    if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request &&
+            (endsWith(github.event.comment.body, '/test-rhel95') ||
+            endsWith(github.event.comment.body, '/test-rhel95-bib-image')) }}
+    continue-on-error: true
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
+        with:
+          ref: ${{ needs.pr-info.outputs.sha }}
+          fetch-depth: 0
+
+      # bib cross arch build needs Fedora runner to install qemu-user-static
+      - name: Run the tests
+        uses: sclorg/testing-farm-as-github-action@v2
+        with:
+          compose: RHEL-9.5.0-Nightly
+          api_key: ${{ secrets.TF_API_KEY }}
+          git_url: ${{ needs.pr-info.outputs.repo_url }}
+          git_ref: ${{ needs.pr-info.outputs.ref }}
+          arch: ${{ matrix.arch }}
+          update_pull_request_status: true
+          pull_request_status_name: "bootc-rhel95-bib-${{ matrix.arch }}"
+          tmt_context: "arch=${{ matrix.arch }};distro=rhel"
+          tmt_plan_regex: "/edge-test/"
+          tf_scope: private
+          secrets: "TIER1_IMAGE_URL=${{ secrets.RHEL95_TIER1_IMAGE_URL }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};QUAY_SECRET=${{ secrets.QUAY_SECRET }};DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};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 }};RHC_AK=${{ secrets.RHC_AK }};RHC_ORGID=${{ secrets.RHC_ORGID }};RHEL_REGISTRY_URL=${{ secrets.RHEL_REGISTRY_URL }}"
+          variables: "ARCH=${{ matrix.arch }};AWS_REGION=${{ secrets.AWS_REGION }};GOVC_INSECURE=1"
diff --git 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,9 +9,9 @@ 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-44') ||
+            endsWith(github.event.comment.body, '/test-rhel-9-4-virt') ||
+            endsWith(github.event.comment.body, '/test-rhel-9-4-ng') ||
             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') ||
@@ -72,7 +72,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
@@ -101,7 +101,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
@@ -130,7 +130,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
@@ -159,7 +159,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
@@ -188,7 +188,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: aarch64
@@ -217,7 +217,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
@@ -246,7 +246,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
@@ -275,7 +275,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: aarch64
@@ -304,7 +304,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
@@ -333,7 +333,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
@@ -362,7 +362,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
@@ -391,7 +391,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
@@ -420,7 +420,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
@@ -449,7 +449,7 @@ jobs:
           fetch-depth: 0
 
       - name: Run the tests
-        uses: sclorg/testing-farm-as-github-action@v1
+        uses: sclorg/testing-farm-as-github-action@main
         with:
           compose: RHEL-9.4.0-Nightly
           arch: x86_64
@@ -478,7 +478,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

diff --git 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
@@ -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
@@ -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