From 25bcf445dba6dcb4b142d09a89c65febb2fdd037 Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Thu, 19 Aug 2021 11:45:00 +0200
Subject: [PATCH] TMSS-517: Set install path inside the build directory.
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57d6dfd7575..52cc0701e13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,11 +99,12 @@ build_SCU:
script:
- echo "Building SCU & TMSSFrontend..."
- mkdir -p build/gnucxx11_opt
+ - mkdir -p build/gnucxx11_opt/install
- cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES="SCU TMSSFrontend" -DUSE_PYTHON=$USE_PYTHON -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
- make -j $(nproc)
- - make DESTDIR=${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install install
- - cd ${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install/opt/lofar
+ - make DESTDIR=install install
+ - cd install/opt/lofar
- tar --ignore-failed-read --exclude=include --exclude="*.ztar" -czf ${PACKAGE}_${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}.ztar *
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ${PACKAGE}_${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}.ztar "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${PACKAGE}/${VERSION}/${PACKAGE}_${CI_COMMIT_REF_NAME}_0.x86_64.ztar"'
interruptible: true
@@ -113,7 +114,6 @@ build_SCU:
expire_in: 6 hours
paths:
- build/gnucxx11_opt
- - ${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install
build_LTAIngest:
stage: build
@@ -327,7 +327,7 @@ dockerize_TMSS:
allow_failure: true
script:
- cd build/gnucxx11_opt
- - docker build --build-arg TMSS_VERSION=$CI_COMMIT_SHORT_SHA --build-arg TMSS_COPY_DIR=${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install/opt/lofar -t tmss_django:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile-tmss .
+ - docker build --build-arg TMSS_VERSION=$CI_COMMIT_SHORT_SHA --build-arg TMSS_COPY_DIR=install/opt/lofar -t tmss_django:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile-tmss .
- docker login -u $CI_NEXUS_REGISTRY_USERNAME -p $CI_NEXUS_REGISTRY_PASSWORD $CI_NEXUS_REGISTRY
- docker tag tmss_django:$CI_COMMIT_SHORT_SHA $CI_NEXUS_REGISTRY_LOCATION/tmss_django:$CI_COMMIT_SHORT_SHA
- docker push $CI_NEXUS_REGISTRY_LOCATION/tmss_django:$CI_COMMIT_SHORT_SHA
--
GitLab