Move up to workflow env. context

Run-GHA: true Skip-PR-comments: true Test-tag: always_passes Required-githooks: true #Pragmas from previous commit message: Run-GHA: true Skip-PR-comments: true Test-tag: always_passes Run-GHA: true Skip-PR-comments: true Test-tag: always_passes Run-GHA: true Skip-PR-comments: true Test-tag: always_passes Run-GHA: true Skip-PR-comments: true Test-tag: always_passes Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Dec 3, 2024 · d3d0db9 · d3d0db9
1 parent 506621e
commit d3d0db9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/bullseye-coverage.yml b/.github/workflows/bullseye-coverage.yml
@@ -6,6 +6,19 @@ env:
   NEXT_VERSION_master: 1000
   # Which distros to build for
   COVFN_DISABLED: false
+  # see https://github.com/organizations/daos-stack/settings/variables/actions for
+  # the organizational defaults values for these variables
+  # 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 ecept the highest
+  EL8_BUILD_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
+  EL8_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
+  EL9_BUILD_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
+  EL9_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
+  LEAP15_VERSION: ${{ vars.LEAP15_VERSION_MASTER }}
+  # Which distros to build for
+  TEST_TAG: ${{ vars.TEST_TAG }}
+  PACKAGING_DIR: ${{ vars.PACKAGING_DIR }}
 
 on:
   workflow_dispatch:
@@ -55,20 +68,6 @@ jobs:
     # in the Call-RPM-Build job but the above issue prevents it
     name: Compute outputs
     runs-on: [self-hosted, light]
-    env:
-      # see https://github.com/organizations/daos-stack/settings/variables/actions for
-      # the organizational defaults values for these variables
-      # 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 ecept the highest
-      EL8_BUILD_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
-      EL8_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
-      EL9_BUILD_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
-      EL9_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
-      LEAP15_VERSION: ${{ vars.LEAP15_VERSION_MASTER }}
-      # Which distros to build for
-      TEST_TAG: ${{ vars.TEST_TAG }}
-      PACKAGING_DIR: ${{ vars.PACKAGING_DIR }}
     outputs:
       NAME: ${{ env.NAME }}
       DISTROS: ${{ env.COVFN_DISABLED == 'true' && vars.DISTROS_MASTER ||

diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml
@@ -6,6 +6,19 @@ env:
   NEXT_VERSION_master: 1000
   # Which distros to build for
   COVFN_DISABLED: true
+  # see https://github.com/organizations/daos-stack/settings/variables/actions for
+  # the organizational defaults values for these variables
+  # 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 ecept the highest
+  EL8_BUILD_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
+  EL8_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
+  EL9_BUILD_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
+  EL9_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
+  LEAP15_VERSION: ${{ vars.LEAP15_VERSION_MASTER }}
+  # Which distros to build for
+  TEST_TAG: ${{ vars.TEST_TAG }}
+  PACKAGING_DIR: ${{ vars.PACKAGING_DIR }}
 
 on:
   workflow_dispatch:
@@ -55,20 +68,6 @@ jobs:
     # in the Call-RPM-Build job but the above issue prevents it
     name: Compute outputs
     runs-on: [self-hosted, light]
-    env:
-      # see https://github.com/organizations/daos-stack/settings/variables/actions for
-      # the organizational defaults values for these variables
-      # 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 ecept the highest
-      EL8_BUILD_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
-      EL8_VERSION: ${{ vars.EL8_BUILD_VERSION_MASTER }}
-      EL9_BUILD_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
-      EL9_VERSION: ${{ vars.EL9_BUILD_VERSION_MASTER }}
-      LEAP15_VERSION: ${{ vars.LEAP15_VERSION_MASTER }}
-      # Which distros to build for
-      TEST_TAG: ${{ vars.TEST_TAG }}
-      PACKAGING_DIR: ${{ vars.PACKAGING_DIR }}
     outputs:
       NAME: ${{ env.NAME }}
       DISTROS: ${{ env.COVFN_DISABLED == 'true' && vars.DISTROS_MASTER ||