Rearrange CI file usage to make files available to helm

.gitlab-ci.yml

@@ -68,9 +68,9 @@ build ci:
     # most recent docker image should be tagged with most recent SHA
     - docker_tag=$(git rev-parse --short HEAD)
     - echo $docker_tag
-    # make the docker tag available in later stages
-    - echo export docker_tag=$docker_tag >cibuild.env
     - cd chart
+    # make the docker tag available in later stages
+    - echo export docker_tag=$docker_tag >${SUBCOMP_CHART_DIR}/cibuild.env
     - |-
       sed -i "s/^appVersion: .*\$/appVersion: ${docker_tag}/g" ${SUBCOMP_CHART_DIR}/Chart.yaml
     # debug:
@@ -78,7 +78,6 @@ build ci:
   artifacts:
     paths:
       - ${SUBCOMP_REPOS}/chart/${SUBCOMP_CHART_DIR}
-      - ${SUBCOMP_REPOS}/cibuild.env
     expire_in: 6 hours
 # XXX: Do we always want to clone the subcomponent
 #  rules:
@@ -105,13 +104,14 @@ deploy_g16_grb:
       else
         ns="geosphere-test";
       fi
-    - cd geosphere-grb
+    - cd geosphere-grb/chart
     - source cibuild.env
-    - echo "Deploying version $docker_tag to cluster namespace $ns"
-    - cd chart
     # copy secret kubeconfig to the mounted (pwd) directory
     - cp $kubekorner_k3s_config .
     - kubeconfig=$(basename $kubekorner_k3s_config)
+    - echo "Deploying version $docker_tag to cluster namespace $ns"
+    # copy extra values files to the local directory (where helm has access via docker mount)
+    - cp ../../production/values-g16-grb.yaml .
     # namespace names are the same as domain names
     - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns --set grbNotifier.image.dockerTag=$docker_tag -f ../../production/values-g16-grb.yaml cspp-geo-grb cspp-geo-grb/
   needs: