Move more scripts into YAML file

As much as this sucks. Lack of linting, etc. Skip-PR-comments: true Run-GHA: true Required-githooks: true Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Jul 3, 2024 · aa402eb · aa402eb
1 parent d9c3774
commit aa402eb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 76 deletions.
diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml
@@ -323,8 +323,16 @@ jobs:
         id: build-rpm
         continue-on-error: true
         # yamllint disable rule:line-length
-        run: rm -rf mock_result;
-             mkdir -p mock_result;
+        run: |
+             rm -rf mock_result
+             mkdir -p mock_result
+             if [ -e ci/rpm/build.sh ]; then
+                 script="ci/rpm/build.sh"
+             else
+                 script="rm -rf artifacts/$TARGET/
+                         mkdir -p artifacts/$TARGET/
+                         make chrootbuild"
+             fi
              docker run --name mock-build-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.distro }}
                         --user build
                         -v "$PWD":"$PWD" -w "$PWD"
@@ -339,7 +347,7 @@ jobs:
                         -e REPO_FILE_URL="$REPO_FILE_URL"
                         -e JENKINS_URL="$JENKINS_URL"
                         -e TARGET="$TARGET"
-                        mock-build ci/rpm/build.sh
+                        mock-build bash -c "$script"
         # yamllint enable rule:line-length
       - name: Build RPM failure log
         id: build-rpm-fail-log
@@ -359,7 +367,13 @@ jobs:
         id: create-repo
         if: steps.build-rpm.outcome == 'success'
         continue-on-error: true
-        run: CHROOT_NAME=$CHROOT_NAME ci/rpm/create_repo.sh
+        run: |
+             set -eux
+             repo_path="$REPO_PATH$GITHUB_RUN_NUMBER/artifact/artifacts/"
+             mkdir -p "$repo_path$TARGET"
+             cp -a mock_result/*.rpm "$repo_path$TARGET"
+             cd "$repo_path$TARGET"
+             createrepo .
       - name: Test repo
         id: test-repo
         if: steps.create-repo.outcome == 'success'

diff --git a/ci/rpm/build.sh b/ci/rpm/build.sh
diff --git a/ci/rpm/create_repo.sh b/ci/rpm/create_repo.sh