Updates.

Required-githooks: true Signed-off-by: Phil Henderson <[email protected]>
daos-stack · Oct 11, 2024 · 94163e2 · 94163e2
1 parent b973d2c
commit 94163e2
Show file tree

Hide file tree

Showing 3 changed files with 353 additions and 349 deletions.
diff --git a/.github/actions/build-rpm/action.yml b/.github/actions/build-rpm/action.yml
@@ -1,16 +1,6 @@
 name: 'Build RPM'
 description: 'Build DAOS RPMs'
 
-env:
-  # TODO: we really need to define a list of supported versions (ideally it's no more than 2)
-  #       build is done on the lowest version and test on the highest with a "sanity test"
-  #       stage done on all versions in the list except the highest
-  EL8_BUILD_VERSION: 8.6
-  EL8_VERSION: 8.8
-  EL9_BUILD_VERSION: 9
-  EL9_VERSION: 9
-  LEAP15_VERSION: 15.5
-
 on:
   workflow_call:
     inputs:
@@ -24,155 +14,158 @@ on:
         type: bool
         default: true
 
-jobs:
-  Build-RPM:
-    name: Bullseye Build RPM
-    permissions:
-      statuses: write
-    runs-on: [self-hosted, docker]
-    if: ((!cancelled()) || success() || failure())
-    env:
-      ARTIFACTORY_URL: https://artifactory.dc.hpdd.intel.com/
-      JENKINS_URL: https://build.hpdd.intel.com/
-      DAOS_EMAIL: [email protected]
-      DAOS_FULLNAME: daos-stack
-      DISTRO: ${{ inputs.distro }}
-      DISTRO_REPOS: disabled
-      # DOCKER_BUILDKIT: 0
-      ARTIFACTS_URL: file:///scratch/job_repos/
-      MOCK_OPTIONS: --uniqueext=${{ github.run_id }}
-      PR_NUM: ${{ github.event.pull_request.number }}
-      # TODO -- this should be on stable, backed up storage, not /scratch
+env:
+  # TODO: we really need to define a list of supported versions (ideally it's no more than 2)
+  #       build is done on the lowest version and test on the highest with a "sanity test"
+  #       stage done on all versions in the list except the highest
+  EL8_BUILD_VERSION: 8.6
+  EL8_VERSION: 8.8
+  EL9_BUILD_VERSION: 9
+  EL9_VERSION: 9
+  LEAP15_VERSION: 15.5
+
+  ARTIFACTORY_URL: https://artifactory.dc.hpdd.intel.com/
+  JENKINS_URL: https://build.hpdd.intel.com/
+  DAOS_EMAIL: [email protected]
+  DAOS_FULLNAME: daos-stack
+  DISTRO: ${{ inputs.distro }}
+  DISTRO_REPOS: disabled
+  # DOCKER_BUILDKIT: 0
+  ARTIFACTS_URL: file:///scratch/job_repos/
+  MOCK_OPTIONS: --uniqueext=${{ github.run_id }}
+  PR_NUM: ${{ github.event.pull_request.number }}
+  # TODO -- this should be on stable, backed up storage, not /scratch
+  # yamllint disable-line rule:line-length
+  REPO_PATH: /scratch/job_repos/daos-stack/job/daos/job/PR-${{ github.event.pull_request.number }}/
+  REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/
+  RUN_ID: ${{ github.run_id }}
+  TARGET: ${{ inputs.distro }}
+  # keep VS Code's GHA linting happy
+  STAGE_NAME:
+  DISTRO_NAME:
+  DISTRO_VERSION:
+  CP_LEAP15_VERSION:
+  COMMIT_STATUS_DISTRO_VERSION:
+  FVERSION:
+
+runs:
+  - name: Set variables
+    run: |
+        FVERSION="38"
+        case ${{ inputs.distro }} in
+            'el8')
+                CHROOT_NAME="rocky+epel-8-x86_64"
+                DISTRO_NAME="EL"
+                DISTRO_VERSION="${{ env.EL8_BUILD_VERSION }}"
+                COMMIT_STATUS_DISTRO_VERSION="8"
+                ;;
+            'el9')
+                CHROOT_NAME="rocky+epel-9-x86_64"
+                DISTRO_NAME="EL"
+                DISTRO_VERSION="${{ env.EL9_BUILD_VERSION }}"
+                ;;
+            'leap15')
+                CHROOT_NAME="opensuse-leap-${{ env.CP_LEAP15_VERSION &&
+                                                env.CP_LEAP15_VERSION ||
+                                                env.LEAP15_VERSION }}-x86_64"
+                DISTRO_NAME="Leap"
+                DISTRO_VERSION="${{ env.CP_LEAP15_VERSION &&
+                                    env.CP_LEAP15_VERSION || env.LEAP15_VERSION }}"
+                ;;
+        esac
+        echo "CHROOT_NAME=$CHROOT_NAME" >> $GITHUB_ENV
+        echo "DISTRO_NAME=$DISTRO_NAME" >> $GITHUB_ENV
+        echo "DISTRO_VERSION=$DISTRO_VERSION" >> $GITHUB_ENV
+        echo "BUILD_CHROOT=/var/lib/mock/$CHROOT_NAME-${{ github.run_id }}/" >> $GITHUB_ENV
+        echo "STAGE_NAME=Build RPM on $DISTRO_NAME $DISTRO_VERSION" >> $GITHUB_ENV
+        echo "FVERSION=$FVERSION" >> $GITHUB_ENV
+        echo "COMMIT_STATUS_DISTRO_VERSION=$COMMIT_STATUS_DISTRO_VERSION" >> $GITHUB_ENV
+        echo "COVFN_DISABLED=${{ inputs.covfn_disabled }}" >> $GITHUB_ENV
+  - name: Checkout code
+    uses: actions/[email protected]
+    with:
+      ref: ${{ github.event.pull_request.head.sha }}
+  - name: Build RPM Docker image
+    id: build-rpm-docker-image
+    continue-on-error: true
+    run: docker build --file utils/rpms/packaging/Dockerfile.mockbuild
+                      --build-arg CACHEBUST=$(date +%s%3N)
+                      --build-arg CB0=$(date +%V)
+                      --build-arg REPO_FILE_URL=$REPO_FILE_URL
+                      --build-arg UID=$(id -u)
+                      --build-arg FVERSION=${{ env.FVERSION }}
+                      --build-arg JENKINS_URL=${{ env.JENKINS_URL }}
+                      --tag mock-build
+                      utils/rpms
+  - name: Build RPM
+    id: build-rpm
+    continue-on-error: true
+    # yamllint disable rule:line-length
+    run: rm -rf mock_result;
+          mkdir -p mock_result;
+          docker run --name mock-build-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.distro }}
+                    --user build
+                    -v "$PWD":"$PWD" -w "$PWD"
+                    -v "$PWD"/mock_result:/var/lib/mock/$CHROOT_NAME/result
+                    --privileged=true
+                    -e DAOS_FULLNAME="$DAOS_FULLNAME"
+                    -e DAOS_EMAIL="$DAOS_EMAIL"
+                    -e DISTRO_VERSION="$DISTRO_VERSION"
+                    -e STAGE_NAME="$STAGE_NAME"
+                    -e CHROOT_NAME="$CHROOT_NAME"
+                    -e ARTIFACTORY_URL="$ARTIFACTORY_URL"
+                    -e REPO_FILE_URL="$REPO_FILE_URL"
+                    -e JENKINS_URL=${{ env.JENKINS_URL }}
+                    -e TARGET="$TARGET"
+                    -e COVFN_DISABLED="$COVFN_DISABLED"
+                    mock-build ci/rpm/build.sh
+    # yamllint enable rule:line-length
+  - name: Build RPM failure log
+    id: build-rpm-fail-log
+    continue-on-error: true
+    if: steps.build-rpm.outcome != 'success'
+    run: cat mock_result/root.log;
+          cat mock_result/build.log
+  - name: Save RPM build logs
+    continue-on-error: true
+    uses: actions/upload-artifact@v4
+    with:
+      name: ${{ env.STAGE_NAME }} logs
+      path: |
+        mock_result/root.log
+        mock_result/build.log
+  - name: Create lastBuild and lastSuccessfulBuild symlinks
+    if: steps.build-rpm.outcome == 'success'
+    run: . ci/gha_functions.sh;
+          mkdir -p ${REPO_PATH};
+          rm -f ${REPO_PATH}last{,Successful}Build;
+          ln -s ${{ github.run_number }} ${REPO_PATH}lastBuild;
+          ln -s ${{ github.run_number }} ${REPO_PATH}lastSuccessfulBuild
+  - name: Create repo
+    id: create-repo
+    if: steps.build-rpm.outcome == 'success'
+    continue-on-error: true
+    run: CHROOT_NAME=$CHROOT_NAME ci/rpm/create_repo.sh
+  - name: Test repo
+    id: test-repo
+    if: steps.create-repo.outcome == 'success'
+    continue-on-error: true
+    run: . ci/gha_functions.sh;
+          dnf --disablerepo=\* --repofrompath
+              testrepo,file://${REPO_PATH}${{ github.run_number }}/artifact/artifacts/$TARGET
+              repoquery -a
+  - name: Remove lastSuccessfulBuild link and exit failure
+    if: steps.test-repo.outcome != 'success'
+    run: rm -f ${REPO_PATH}lastSuccessfulBuild;
+          exit 1
+  - name: Publish RPMs
+    uses: actions/upload-artifact@v4
+    with:
+      name: ${{ env.DISTRO_NAME }} ${{ env.DISTRO_VERSION }} RPM repository
+      path: ${{ env.REPO_PATH}}${{ github.run_number }}/artifact/artifacts/${{ env.TARGET }}
+  - name: Update commit status
+    uses: ouzi-dev/commit-status-updater@v2
+    with:
       # yamllint disable-line rule:line-length
-      REPO_PATH: /scratch/job_repos/daos-stack/job/daos/job/PR-${{ github.event.pull_request.number }}/
-      REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/
-      RUN_ID: ${{ github.run_id }}
-      TARGET: ${{ inputs.distro }}
-      # keep VS Code's GHA linting happy
-      STAGE_NAME:
-      DISTRO_NAME:
-      DISTRO_VERSION:
-      CP_LEAP15_VERSION:
-      COMMIT_STATUS_DISTRO_VERSION:
-      FVERSION:
-    steps:
-      - name: Set variables
-        run: |
-            FVERSION="38"
-            case ${{ inputs.distro }} in
-                'el8')
-                    CHROOT_NAME="rocky+epel-8-x86_64"
-                    DISTRO_NAME="EL"
-                    DISTRO_VERSION="${{ env.EL8_BUILD_VERSION }}"
-                    COMMIT_STATUS_DISTRO_VERSION="8"
-                    ;;
-                'el9')
-                    CHROOT_NAME="rocky+epel-9-x86_64"
-                    DISTRO_NAME="EL"
-                    DISTRO_VERSION="${{ env.EL9_BUILD_VERSION }}"
-                    ;;
-                'leap15')
-                    CHROOT_NAME="opensuse-leap-${{ env.CP_LEAP15_VERSION &&
-                                                   env.CP_LEAP15_VERSION ||
-                                                   env.LEAP15_VERSION }}-x86_64"
-                    DISTRO_NAME="Leap"
-                    DISTRO_VERSION="${{ env.CP_LEAP15_VERSION &&
-                                        env.CP_LEAP15_VERSION || env.LEAP15_VERSION }}"
-                    ;;
-            esac
-            echo "CHROOT_NAME=$CHROOT_NAME" >> $GITHUB_ENV
-            echo "DISTRO_NAME=$DISTRO_NAME" >> $GITHUB_ENV
-            echo "DISTRO_VERSION=$DISTRO_VERSION" >> $GITHUB_ENV
-            echo "BUILD_CHROOT=/var/lib/mock/$CHROOT_NAME-${{ github.run_id }}/" >> $GITHUB_ENV
-            echo "STAGE_NAME=Build RPM on $DISTRO_NAME $DISTRO_VERSION" >> $GITHUB_ENV
-            echo "FVERSION=$FVERSION" >> $GITHUB_ENV
-            echo "COMMIT_STATUS_DISTRO_VERSION=$COMMIT_STATUS_DISTRO_VERSION" >> $GITHUB_ENV
-            echo "COVFN_DISABLED=${{ inputs.covfn_disabled }}" >> $GITHUB_ENV
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Build RPM Docker image
-        id: build-rpm-docker-image
-        continue-on-error: true
-        run: docker build --file utils/rpms/packaging/Dockerfile.mockbuild
-                          --build-arg CACHEBUST=$(date +%s%3N)
-                          --build-arg CB0=$(date +%V)
-                          --build-arg REPO_FILE_URL=$REPO_FILE_URL
-                          --build-arg UID=$(id -u)
-                          --build-arg FVERSION=${{ env.FVERSION }}
-                          --build-arg JENKINS_URL=${{ env.JENKINS_URL }}
-                          --tag mock-build
-                          utils/rpms
-      - name: Build RPM
-        id: build-rpm
-        continue-on-error: true
-        # yamllint disable rule:line-length
-        run: rm -rf mock_result;
-             mkdir -p mock_result;
-             docker run --name mock-build-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.distro }}
-                        --user build
-                        -v "$PWD":"$PWD" -w "$PWD"
-                        -v "$PWD"/mock_result:/var/lib/mock/$CHROOT_NAME/result
-                        --privileged=true
-                        -e DAOS_FULLNAME="$DAOS_FULLNAME"
-                        -e DAOS_EMAIL="$DAOS_EMAIL"
-                        -e DISTRO_VERSION="$DISTRO_VERSION"
-                        -e STAGE_NAME="$STAGE_NAME"
-                        -e CHROOT_NAME="$CHROOT_NAME"
-                        -e ARTIFACTORY_URL="$ARTIFACTORY_URL"
-                        -e REPO_FILE_URL="$REPO_FILE_URL"
-                        -e JENKINS_URL=${{ env.JENKINS_URL }}
-                        -e TARGET="$TARGET"
-                        -e COVFN_DISABLED="$COVFN_DISABLED"
-                        mock-build ci/rpm/build.sh
-        # yamllint enable rule:line-length
-      - name: Build RPM failure log
-        id: build-rpm-fail-log
-        continue-on-error: true
-        if: steps.build-rpm.outcome != 'success'
-        run: cat mock_result/root.log;
-             cat mock_result/build.log
-      - name: Save RPM build logs
-        continue-on-error: true
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.STAGE_NAME }} logs
-          path: |
-            mock_result/root.log
-            mock_result/build.log
-      - name: Create lastBuild and lastSuccessfulBuild symlinks
-        if: steps.build-rpm.outcome == 'success'
-        run: . ci/gha_functions.sh;
-             mkdir -p ${REPO_PATH};
-             rm -f ${REPO_PATH}last{,Successful}Build;
-             ln -s ${{ github.run_number }} ${REPO_PATH}lastBuild;
-             ln -s ${{ github.run_number }} ${REPO_PATH}lastSuccessfulBuild
-      - name: Create repo
-        id: create-repo
-        if: steps.build-rpm.outcome == 'success'
-        continue-on-error: true
-        run: CHROOT_NAME=$CHROOT_NAME ci/rpm/create_repo.sh
-      - name: Test repo
-        id: test-repo
-        if: steps.create-repo.outcome == 'success'
-        continue-on-error: true
-        run: . ci/gha_functions.sh;
-             dnf --disablerepo=\* --repofrompath
-                 testrepo,file://${REPO_PATH}${{ github.run_number }}/artifact/artifacts/$TARGET
-                 repoquery -a
-      - name: Remove lastSuccessfulBuild link and exit failure
-        if: steps.test-repo.outcome != 'success'
-        run: rm -f ${REPO_PATH}lastSuccessfulBuild;
-             exit 1
-      - name: Publish RPMs
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.DISTRO_NAME }} ${{ env.DISTRO_VERSION }} RPM repository
-          path: ${{ env.REPO_PATH}}${{ github.run_number }}/artifact/artifacts/${{ env.TARGET }}
-      - name: Update commit status
-        uses: ouzi-dev/commit-status-updater@v2
-        with:
-          # yamllint disable-line rule:line-length
-          name: 'build/Build RPM on ${{ env.DISTRO_NAME }} ${{ env.COMMIT_STATUS_DISTRO_VERSION && env.COMMIT_STATUS_DISTRO_VERSION || env.DISTRO_VERSION }}'
-          status: "${{ job.status }}"
+      name: 'build/Build RPM on ${{ env.DISTRO_NAME }} ${{ env.COMMIT_STATUS_DISTRO_VERSION && env.COMMIT_STATUS_DISTRO_VERSION || env.DISTRO_VERSION }}'
+      status: "${{ job.status }}"