.deploy.gitlab-ci.yml

+stages:
+  - deploy
+
+deploy_nomad:
+  stage: deploy
+  image:
+    name: hashicorp/levant
+    entrypoint: [ "" ]
+  #when: manual
+  parallel:
+    matrix:
+      - STATION:
+          - cs001
+          - dts-lab
+        COMPONENT:
+          - mesh-gateway
+          - monitoring
+          - logging
+          - tango
+          - object-storage
+          - sdptr
+          - device-server
+          - dsconfig
+          - ec-sim
+          - jupyter
+          - snmp-exporter
+          - landing-page
+          - rpc-server
+  environment:
+    name: $STATION
+  script:
+    - |
+      if [ "${STATION}" == "dts-lab" ]; then
+          HOSTNAME="dts-lab.lofar.net"
+      else
+          HOSTNAME="${STATION}c.control.lofar"
+      fi
+      # To deploy manually, get the env.yaml and the .levant.nomad file,
+      # and run docker run --rm -i --net=host -v /path/to/env.yaml:/env.yaml:ro hashicorp/levant deploy --var-file=/env.yaml /dev/stdin < /path/to/file.levant.nomad
+      levant deploy \
+        -address="http://${HOSTNAME}:4646" \
+        -var-file=infra/env.yaml \
+        -var image_tag="${CI_COMMIT_REF_SLUG}" \
+        -var station="${STATION}" \
+        infra/jobs/station/${COMPONENT}.levant.nomad

.gitlab-ci.yml

@@ -363,50 +363,23 @@ release_job:
     tag_name: '$CI_COMMIT_TAG'
     description: '$CI_COMMIT_TAG - $CI_COMMIT_TAG_MESSAGE'
 
-deploy_nomad:
-  stage: deploy
-  image:
-    name: hashicorp/levant
-    entrypoint: [ "" ]
-  needs:
-    - docker_build_image
-    - docker_build_image_device_base
+deploy_nomad_all_components:
+  stage: prepare # should be "deploy" but this is just for testing
+  #needs:
+  #  - docker_build_image
+  #  - docker_build_image_device_base
+  #rules:
+  #  - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
   when: manual
-  rules:
-    - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) || $CI_COMMIT_TAG
+  trigger:
+    include: .deploy.gitlab-ci.yml
+    forward:
+      pipeline_variables: true
   parallel:
     matrix:
       - STATION:
           - cs001
+          - cs032
+          - rs307
           - dts-lab
-        COMPONENT:
-          - mesh-gateway
-          - monitoring
-          - logging
-          - tango
-          - object-storage
-          - sdptr
-          - device-server
-          - dsconfig
-          - ec-sim
-          - jupyter
-          - snmp-exporter
-          - landing-page
-          - rpc-server
-  environment:
-    name: $STATION
-  script:
-    - |
-      if [ "${STATION}" == "dts-lab" ]; then
-          HOSTNAME="dts-lab.lofar.net"
-      else
-          HOSTNAME="${STATION}c.control.lofar"
-      fi
-      # To deploy manually, get the env.yaml and the .levant.nomad file,
-      # and run docker run --rm -i --net=host -v /path/to/env.yaml:/env.yaml:ro hashicorp/levant deploy --var-file=/env.yaml /dev/stdin < /path/to/file.levant.nomad
-      levant deploy \
-        -address="http://${HOSTNAME}:4646" \
-        -var-file=infra/env.yaml \
-        -var image_tag="${CI_COMMIT_REF_SLUG}" \
-        -var station="${STATION}" \
-        infra/jobs/station/${COMPONENT}.levant.nomad
+