diff --git a/.github/workflows/adds-on.yml b/.github/workflows/adds-on.yml index 319f08d01..a0ef19992 100644 --- a/.github/workflows/adds-on.yml +++ b/.github/workflows/adds-on.yml @@ -1,5 +1,5 @@ --- -name: Run customer case on RHEL 9.3.0 +name: Run customer case on RHEL 9.4.0 on: issue_comment: @@ -9,8 +9,8 @@ on: jobs: pr-info: if: ${{ github.event.issue.pull_request && - (endsWith(github.event.comment.body, '/test-fapolicyd-rhel-9-3') || - endsWith(github.event.comment.body, '/test-grafana-pcp-rhel-9-3')) }} + (endsWith(github.event.comment.body, '/test-fapolicyd-rhel-9-4') || + endsWith(github.event.comment.body, '/test-grafana-pcp-rhel-9-4')) }} runs-on: ubuntu-latest steps: - name: Query author repository permissions @@ -44,10 +44,10 @@ jobs: pre-fapolicyd: needs: pr-info if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && - endsWith(github.event.comment.body, '/test-fapolicyd-rhel-9-3') }} + endsWith(github.event.comment.body, '/test-fapolicyd-rhel-9-4') }} runs-on: ubuntu-latest env: - STATUS_NAME: fapolicyd-9.3 + STATUS_NAME: fapolicyd-9.4 steps: - name: Create in-progress status @@ -63,9 +63,9 @@ jobs: fapolicyd: needs: [pr-info, pre-fapolicyd] - runs-on: [kite, x86_64, rhos-01, rhel-9-3, large] + runs-on: [kite, x86_64, rhos-01, rhel-9-4, large] env: - STATUS_NAME: fapolicyd-9.3 + STATUS_NAME: fapolicyd-9.4 steps: - name: Create in-progress status @@ -117,7 +117,7 @@ jobs: - uses: actions/upload-artifact@v3 if: ${{ always() }} with: - name: fapolicyd-9.3 + name: fapolicyd-9.4 path: | *.json *.log @@ -125,10 +125,10 @@ jobs: pre-grafana-pcp: needs: pr-info if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request && - endsWith(github.event.comment.body, '/test-grafana-pcp-rhel-9-3') }} + endsWith(github.event.comment.body, '/test-grafana-pcp-rhel-9-4') }} runs-on: ubuntu-latest env: - STATUS_NAME: grafana-pcp-9.3 + STATUS_NAME: grafana-pcp-9.4 steps: - name: Create in-progress status @@ -144,9 +144,9 @@ jobs: grafana-pcp: needs: [pr-info, pre-grafana-pcp] - runs-on: [kite, x86_64, rhos-01, rhel-9-3, large] + runs-on: [kite, x86_64, rhos-01, rhel-9-4, large] env: - STATUS_NAME: grafana-pcp-9.3 + STATUS_NAME: grafana-pcp-9.4 steps: - name: Create in-progress status @@ -198,7 +198,7 @@ jobs: - uses: actions/upload-artifact@v3 if: ${{ always() }} with: - name: grafana-pcp-9.3 + name: grafana-pcp-9.4 path: | *.json *.log diff --git a/.github/workflows/fdo-container.yml b/.github/workflows/fdo-container.yml index 8af43a3f6..6390e334e 100644 --- a/.github/workflows/fdo-container.yml +++ b/.github/workflows/fdo-container.yml @@ -143,14 +143,14 @@ jobs: route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}' context: ${{ env.STATUS_NAME }} state: pending - description: 'RHEL 9.3 - Runner has been deploying...' + description: 'RHEL 9.4 - Runner has been deploying...' target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} fdo-container-official: needs: [pr-info, pre-fdo-container-official] - runs-on: [kite, x86_64, rhos-01, rhel-9-3, large] + runs-on: [kite, x86_64, rhos-01, rhel-9-4, large] env: STATUS_NAME: fdo-container-official @@ -161,7 +161,7 @@ jobs: route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}' context: ${{ env.STATUS_NAME }} state: pending - description: 'RHEL 9.3 - Test has been running...' + description: 'RHEL 9.4 - Test has been running...' target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -190,7 +190,7 @@ jobs: route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}' context: ${{ env.STATUS_NAME }} state: ${{ job.status }} - description: 'RHEL 9.3 - Test got ${{ job.status }}' + description: 'RHEL 9.4 - Test got ${{ job.status }}' target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -202,7 +202,7 @@ jobs: route: 'POST /repos/${{ github.repository }}/statuses/${{ needs.pr-info.outputs.sha }}' context: ${{ env.STATUS_NAME }} state: error - description: 'RHEL 9.3 - Test got error' + description: 'RHEL 9.4 - Test got error' target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/trigger-adds-on.yml b/.github/workflows/trigger-adds-on.yml index d1a204c54..3ffcea3df 100644 --- a/.github/workflows/trigger-adds-on.yml +++ b/.github/workflows/trigger-adds-on.yml @@ -7,7 +7,7 @@ on: - cron: '0 0 * * 2,6' env: - COMPOSE_URL_93: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/RHEL-9" + COMPOSE_URL_94: "http://${{ secrets.DOWNLOAD_NODE }}/rhel-9/nightly/RHEL-9" jobs: check-compose: @@ -21,24 +21,24 @@ jobs: - name: Check compose and PRMs id: check_compose_and_rpms run: | - curl -s ${COMPOSE_URL_93}/latest-RHEL-9.3.0/COMPOSE_ID --output COMPOSE_ID_93 - COMPOSE_ID_93=$(cat COMPOSE_ID_93) - echo "rhel93_compose=$COMPOSE_ID_93" >> $GITHUB_OUTPUT + curl -s ${COMPOSE_URL_94}/latest-RHEL-9.4.0/COMPOSE_ID --output COMPOSE_ID_94 + COMPOSE_ID_94=$(cat COMPOSE_ID_94) + echo "rhel94_compose=$COMPOSE_ID_94" >> $GITHUB_OUTPUT - FAPOLICYD_VERSION_93=$(curl -s "${COMPOSE_URL_93}/${COMPOSE_ID_93}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">fapolicyd-[0-9].*<" | tr -d "><") - echo "fapolicyd_version_93=$FAPOLICYD_VERSION_93" >> $GITHUB_OUTPUT + FAPOLICYD_VERSION_94=$(curl -s "${COMPOSE_URL_94}/${COMPOSE_ID_94}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">fapolicyd-[0-9].*<" | tr -d "><") + echo "fapolicyd_version_94=$FAPOLICYD_VERSION_94" >> $GITHUB_OUTPUT - GRAFANA_PCP_VERSION_93=$(curl -s "${COMPOSE_URL_93}/${COMPOSE_ID_93}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">grafana-pcp-[0-9].*<" | tr -d "><") - echo "grafana_pcp_version_93=$GRAFANA_PCP_VERSION_93" >> $GITHUB_OUTPUT + GRAFANA_PCP_VERSION_94=$(curl -s "${COMPOSE_URL_94}/${COMPOSE_ID_94}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">grafana-pcp-[0-9].*<" | tr -d "><") + echo "grafana_pcp_version_94=$GRAFANA_PCP_VERSION_94" >> $GITHUB_OUTPUT - PCP_VERSION_93=$(curl -s "${COMPOSE_URL_93}/${COMPOSE_ID_93}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">pcp-[0-9].*.x86_64.rpm<" | tr -d "><") - echo "pcp_version_93=$PCP_VERSION_93" >> $GITHUB_OUTPUT + PCP_VERSION_94=$(curl -s "${COMPOSE_URL_94}/${COMPOSE_ID_94}/compose/AppStream/x86_64/os/Packages/" | grep -ioE ">pcp-[0-9].*.x86_64.rpm<" | tr -d "><") + echo "pcp_version_94=$PCP_VERSION_94" >> $GITHUB_OUTPUT outputs: - rhel93_compose: ${{ steps.check_compose_and_rpms.outputs.rhel93_compose }} - fapolicyd_version_93: ${{ steps.check_compose_and_rpms.outputs.fapolicyd_version_93 }} - grafana_pcp_version_93: ${{ steps.check_compose_and_rpms.outputs.grafana_pcp_version_93 }} - pcp_version_93: ${{ steps.check_compose_and_rpms.outputs.pcp_version_93 }} + rhel94_compose: ${{ steps.check_compose_and_rpms.outputs.rhel94_compose }} + fapolicyd_version_94: ${{ steps.check_compose_and_rpms.outputs.fapolicyd_version_94 }} + grafana_pcp_version_94: ${{ steps.check_compose_and_rpms.outputs.grafana_pcp_version_94 }} + pcp_version_94: ${{ steps.check_compose_and_rpms.outputs.pcp_version_94 }} fapolicyd: needs: check-compose @@ -59,26 +59,26 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "${{ needs.check-compose.outputs.fapolicyd_version_93 }} - ${{ steps.date.outputs.date }}" + commit-message: "${{ needs.check-compose.outputs.fapolicyd_version_94 }} - ${{ steps.date.outputs.date }}" committer: cloudkitebot author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> branch: cpr branch-suffix: random delete-branch: true - title: "${{ needs.check-compose.outputs.fapolicyd_version_93 }} - ${{ steps.date.outputs.date }}" + title: "${{ needs.check-compose.outputs.fapolicyd_version_94 }} - ${{ steps.date.outputs.date }}" labels: DO_NOT_MERGE,fapolicyd body: | - RHEL compose ${{ needs.check-compose.outputs.rhel93_compose }} + RHEL compose ${{ needs.check-compose.outputs.rhel94_compose }} - Date: ${{ steps.date.outputs.date }} - fapolicyd package info: - - ${{ needs.check-compose.outputs.fapolicyd_version_93 }} + - ${{ needs.check-compose.outputs.fapolicyd_version_94 }} - name: Add a comment to trigger test workflow uses: peter-evans/create-or-update-comment@v2 with: token: ${{ secrets.PAT }} issue-number: ${{ steps.cpr.outputs.pull-request-number }} - body: /test-fapolicyd-rhel-9-3 + body: /test-fapolicyd-rhel-9-4 - name: Create a project card to track compose test result uses: peter-evans/create-or-update-project-card@v2 @@ -107,27 +107,27 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "${{ needs.check-compose.outputs.pcp_version_93 }} - ${{ steps.date.outputs.date }}" + commit-message: "${{ needs.check-compose.outputs.pcp_version_94 }} - ${{ steps.date.outputs.date }}" committer: cloudkitebot author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> branch: cpr branch-suffix: random delete-branch: true - title: "${{ needs.check-compose.outputs.pcp_version_93 }} - ${{ steps.date.outputs.date }}" + title: "${{ needs.check-compose.outputs.pcp_version_94 }} - ${{ steps.date.outputs.date }}" labels: DO_NOT_MERGE,grafana-pcp,pcp body: | - RHEL compose ${{ needs.check-compose.outputs.rhel93_compose }} + RHEL compose ${{ needs.check-compose.outputs.rhel94_compose }} - Date: ${{ steps.date.outputs.date }} - grafana and pcp package info: - - ${{ needs.check-compose.outputs.grafana_pcp_version_93 }} - - ${{ needs.check-compose.outputs.pcp_version_93 }} + - ${{ needs.check-compose.outputs.grafana_pcp_version_94 }} + - ${{ needs.check-compose.outputs.pcp_version_94 }} - name: Add a comment to trigger test workflow uses: peter-evans/create-or-update-comment@v2 with: token: ${{ secrets.PAT }} issue-number: ${{ steps.cpr.outputs.pull-request-number }} - body: /test-grafana-pcp-rhel-9-3 + body: /test-grafana-pcp-rhel-9-4 - name: Create a project card to track compose test result uses: peter-evans/create-or-update-project-card@v2 diff --git a/.github/workflows/trigger-fdo-container.yml b/.github/workflows/trigger-fdo-container.yml index e2906cd25..d880b1996 100644 --- a/.github/workflows/trigger-fdo-container.yml +++ b/.github/workflows/trigger-fdo-container.yml @@ -6,6 +6,8 @@ on: schedule: # run 8:05 every Sunday - cron: '5 8 * * 0' + # run 8:05 every Thursday + - cron: '5 8 * * 4' # run every day - cron: '0 3 * * *' @@ -57,7 +59,7 @@ jobs: issue-number: ${{ steps.cpr.outputs.pull-request-number }} fdo-container-official: - if: github.repository == 'virt-s1/rhel-edge' && github.event.schedule == '0 3 * * *' + if: github.repository == 'virt-s1/rhel-edge' && github.event.schedule == '5 8 * * 4' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/trigger-package.yml b/.github/workflows/trigger-package.yml index 55f61ea11..db6aa1092 100644 --- a/.github/workflows/trigger-package.yml +++ b/.github/workflows/trigger-package.yml @@ -58,7 +58,7 @@ jobs: branch-suffix: random delete-branch: true title: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}" - labels: DO_NOT_MERGE,RHEL-8.9.0 + labels: DO_NOT_MERGE,RHEL-8.10.0 body: | Package ${{ github.event.client_payload.package_nvr }} - Date: ${{ steps.date.outputs.date }} @@ -68,7 +68,7 @@ jobs: with: token: ${{ secrets.PAT }} issue-number: ${{ steps.cpr.outputs.pull-request-number }} - body: /test-rhel-8-9 + body: /test-rhel-8-10 - name: Create a project card to track compose test result uses: peter-evans/create-or-update-project-card@v2 @@ -85,6 +85,55 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Prepare package test PR + run: | + package_rpm="${{ github.event.client_payload.rpms }}" + echo "PACKAGE_RPM_LIST=\"$package_rpm\"" > packages/package_ci_trigger + cat packages/package_ci_trigger + + - name: Get current date + id: date + run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT + + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}" + committer: cloudkitebot + author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> + branch: cpr + branch-suffix: random + delete-branch: true + title: "${{ github.event.client_payload.package_nvr }} - ${{ steps.date.outputs.date }}" + labels: DO_NOT_MERGE,RHEL-9.4.0 + body: | + Package ${{ github.event.client_payload.package_nvr }} + - Date: ${{ steps.date.outputs.date }} + + - name: Add a comment to trigger test workflow + uses: peter-evans/create-or-update-comment@v2 + with: + token: ${{ secrets.PAT }} + issue-number: ${{ steps.cpr.outputs.pull-request-number }} + body: /test-rhel-9-4 + + - name: Create a project card to track compose test result + uses: peter-evans/create-or-update-project-card@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + project-name: Packages + column-name: ${{ github.event.client_payload.package_name }} + issue-number: ${{ steps.cpr.outputs.pull-request-number }} + + rhel-9-3: + needs: pr-info + if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.client_payload.distro == 'el9_3' }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Prepare package test PR run: | package_rpm="${{ github.event.client_payload.rpms }}"