streamlined config step

.gitlab-ci.yml

@@ -92,24 +92,27 @@ builder:
     - echo "Creating builder image for ${BUILDER_TARGET}"
     - make ${BUILDER_TARGET}
 
+.config:
+  stage: config
+  script:
+    - bash containers/release/configure_release.sh ${BRANCH}
+  artifacts:
+    paths:
+      - config
 config:stable:
+  extends: .config
   image: eicweb.phy.anl.gov:4567/containers/eic_container/eic_builder:latest
-  stage: config
   only:
     - tags
     - master
-  script:
-   - bash containers/release/configure_release.sh latest
 config:unstable:
+  extends: .config
   image: eicweb.phy.anl.gov:4567/containers/eic_container/eic_builder:unstable
-  stage: config
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"'
       when: manual
     - if: '$CI_COMMIT_BRANCH == "develop"'
       when: on_success
-  script:
-    - bash containers/release/configure_release.sh unstable
       
 release:
   stage: slim

containers/release/configure_release.sh

@@ -9,7 +9,12 @@ mkdir -p config
 
 cp /etc/profile.d/z10_spack_environment.sh config/spack-env.sh
 
-export TAG=$1
+export BRANCH=$1
+if [ ${BRANCH} == "release" ];
+  export TAG="latest"
+else
+  export TAG="unstable"
+fi
 
 ## Spack sets the man-path, which stops bash from using the default man-path
 ## We can fix this by appending a trailing colon to MANPATH