diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92fef49bbfa2c8baf2628a8bd5ae0617d4d90a50..3246f7cd759c2bbbcbd2e7c07b2d0ca10222ad93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,11 +17,6 @@ build_x86_64-centos7-gcc11-dbg_dev3: BINARY_TAG: x86_64-centos7-gcc11-dbg LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-centos7-gcc11-dbg CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-centos7-gcc11-dbg - artifacts: - when: always - expire_in: "3 mos" - paths: - - logs/qmtestCool/$BINARY_TAG before_script: - "echo $BINARY_TAG $CI_COMMIT_REF_NAME" - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq \".[] | select(.name == \\\"build_x86_64-centos7-gcc11-dbg_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)" @@ -32,7 +27,7 @@ build_x86_64-centos7-gcc11-dbg_dev3: stage: build script: - "source $LCG_RELEASE_PATH/setup.sh" - - export CMAKE_PREFIX_PATH=../coral/ci_build:$CMAKE_PREFIX_PATH + - export CMAKE_PREFIX_PATH=./coral/ci_build:$CMAKE_PREFIX_PATH - "cmake $CMAKE_ARGUMENTS -S . -B ci_build" - "cmake --build ci_build" - export CORAL_AUTH_PATH=/home/gitlab-runner/ @@ -48,11 +43,6 @@ build_x86_64-centos7-gcc11-opt_dev3: BINARY_TAG: x86_64-centos7-gcc11-opt LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/dev3/latest/x86_64-centos7-gcc11-opt CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG=x86_64-centos7-gcc11-opt - artifacts: - when: always - expire_in: "3 mos" - paths: - - logs/qmtestCool/$BINARY_TAG before_script: - "echo $BINARY_TAG $CI_COMMIT_REF_NAME" - "export highest=$(curl --header \"PRIVATE-TOKEN: $PRIVATE_TOKEN\" \"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\" | jq \".[] | select(.name == \\\"build_x86_64-centos7-gcc11-opt_dev3\\\") | select(.ref == \\\"${CI_COMMIT_REF_NAME}\\\") | .id\" | sort -n | tail -1)" @@ -63,7 +53,7 @@ build_x86_64-centos7-gcc11-opt_dev3: stage: build script: - "source $LCG_RELEASE_PATH/setup.sh" - - export CMAKE_PREFIX_PATH=../coral/ci_build:$CMAKE_PREFIX_PATH + - export CMAKE_PREFIX_PATH=./coral/ci_build:$CMAKE_PREFIX_PATH - "cmake $CMAKE_ARGUMENTS -S . -B ci_build" - "cmake --build ci_build" - export CORAL_AUTH_PATH=/home/gitlab-runner/ diff --git a/script-gitlab-ci.yml.py b/script-gitlab-ci.yml.py index d0d4022e066571b6a1537b8dd9d9ce261b093b28..3accf648da125edd914f487d94387505a446f999 100755 --- a/script-gitlab-ci.yml.py +++ b/script-gitlab-ci.yml.py @@ -7,11 +7,6 @@ def build_gitlabci(binary_tag, view, OS): BINARY_TAG: {binary_tag} LCG_RELEASE_PATH: /cvmfs/sft-nightlies.cern.ch/lcg/views/{view}/latest/{binary_tag} CMAKE_ARGUMENTS: -DCMAKE_BUILD_TYPE=Debug -DLCG_python3=on -DBINARY_TAG={binary_tag} - artifacts: - when: always - expire_in: "3 mos" - paths: - - logs/qmtestCool/$BINARY_TAG before_script: - "echo $BINARY_TAG $CI_COMMIT_REF_NAME" - "export highest=$(curl --header \\\"PRIVATE-TOKEN: $PRIVATE_TOKEN\\\" \\\"https://gitlab.cern.ch/api/v4/projects/25684/jobs?per_page=100\\\" | jq \\\".[] | select(.name == \\\\\\\"{name}\\\\\\\") | select(.ref == \\\\\\\"${{CI_COMMIT_REF_NAME}}\\\\\\\") | .id\\\" | sort -n | tail -1)" @@ -22,7 +17,7 @@ def build_gitlabci(binary_tag, view, OS): stage: build script: - "source $LCG_RELEASE_PATH/setup.sh" - - export CMAKE_PREFIX_PATH=../coral/ci_build:$CMAKE_PREFIX_PATH + - export CMAKE_PREFIX_PATH=./coral/ci_build:$CMAKE_PREFIX_PATH - "cmake $CMAKE_ARGUMENTS -S . -B ci_build" - "cmake --build ci_build" - export CORAL_AUTH_PATH=/home/gitlab-runner/