Pass through LEAP15_VERSION

Skip-PR-comments: true Run-GHA: true Required-githooks: true Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Apr 24, 2024 · f31e3d0 · f31e3d0
1 parent 34fc9ec
commit f31e3d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml
@@ -50,6 +50,7 @@ jobs:
       DISTROS: ${{ env.DISTROS }}
       EL8_BUILD_VERSION: ${{ env.EL8_BUILD_VERSION }}
       EL9_BUILD_VERSION: ${{ env.EL9_BUILD_VERSION }}
+      LEAP15_VERSION: ${{ env.LEAP15_VERSION }}
       PACKAGING_DIR: ${{ env.PACKAGING_DIR }}
     steps:
       - name: Echo
@@ -67,6 +68,7 @@ jobs:
       DISTROS: ${{ needs.variables.outputs.DISTROS }}
       EL8_BUILD_VERSION: ${{ needs.variables.outputs.EL8_BUILD_VERSION }}
       EL9_BUILD_VERSION: ${{ needs.variables.outputs.EL9_BUILD_VERSION }}
+      LEAP15_VERSION: ${{ needs.variables.outputs.LEAP15_VERSION }}
       PACKAGING_DIR: ${{ needs.variables.outputs.PACKAGING_DIR}}
 
   Test-with-DAOS:

diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml
@@ -15,6 +15,9 @@ on:
       EL9_BUILD_VERSION:
         type: string
         required: true
+      LEAP15_VERSION:
+        type: string
+        required: true
       PACKAGING_DIR:
         type: string
         required: true
@@ -260,10 +263,10 @@ jobs:
                 'leap15')
                     CHROOT_NAME='opensuse-leap-${{ env.CP_LEAP15_VERSION &&
                                                    env.CP_LEAP15_VERSION ||
-                                                   env.LEAP15_VERSION }}-x86_64'
+                                                   inputs.LEAP15_VERSION }}-x86_64'
                     DISTRO_NAME="Leap"
                     DISTRO_VERSION='${{ env.CP_LEAP15_VERSION &&
-                                        env.CP_LEAP15_VERSION || env.LEAP15_VERSION }}'
+                                        env.CP_LEAP15_VERSION || inputs.LEAP15_VERSION }}'
                     ;;
             esac
             echo "CHROOT_NAME=$CHROOT_NAME" >> $GITHUB_ENV