diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea8e9885b7a73d6b22b0bb4509320da38accd77b..85c4565996957cedac8cb89e1ff8f3d13f9a40ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,10 +3,7 @@ default: name: $CI_REGISTRY_IMAGE/ci-build-runner:$CI_COMMIT_REF_SLUG pull_policy: always before_script: - | - echo "CI project URL: ${CI_PROJECT_URL}" - env - python --version # For debugging + - python --version # For debugging cache: paths: - .cache/pip @@ -153,12 +150,15 @@ render_CDB: echo "Generating CDB for ${STATION} from ${FILES}" l2ss-merge-cdb ${FILES} > ${CI_PROJECT_DIR}/generated/CDB/deploy/${STATION}.json done + + echo "${CI_JOB_ID}" > render-cdb-job-id.txt artifacts: expire_in: 4 weeks expose_as: 'deployment cdb configs' name: deploy-cdb paths: - generated/CDB/deploy/ + - render-cdb-job-id.txt # Collect services from this repo, to deploy as Nomad jobs on a station render_levant: @@ -589,6 +589,11 @@ deploy_CDB: - uname script: - | + RENDER_CDB_JOB_ID=`cat render-cdb-job-id.txt` + echo $RENDER_CDB_JOB_ID + + echo "Artefact URL: ${CI_PROJECT_URL}/-/jobs/${RENDER_CDB_JOB_ID}/artefacts/file/generated/CDB/deploy/${STATION}.json?inline=false" + if [ "${STATION}" == "dts-lab" ]; then # dts-lab test station HOSTNAME="dts-lab.lofar.net" @@ -599,9 +604,4 @@ deploy_CDB: REGION="lofar-${STATION}" fi - echo "CI project URL: ${CI_PROJECT_URL}" - - for COMPONENT in ${COMPONENTS}; do - echo "Deploying ${STATION} component ${COMPONENT}" - nomad job dispatch -address="http://${HOSTNAME}:4646" -region="$PREGION}" dsconfig -meta cdb_json_url=${CDB_JSON_URL} - done + #nomad job dispatch -address="http://${HOSTNAME}:4646" -region="$PREGION}" dsconfig -meta cdb_json_url=${CDB_JSON_URL}