Skip to content
Snippets Groups Projects
Commit fb59631f authored by Jorge Camarero Vera's avatar Jorge Camarero Vera
Browse files

Resolve "CI should cancel running jobs for a branch after a force push"

parent 019b4d84
No related branches found
No related tags found
No related merge requests found
......@@ -50,19 +50,21 @@ variables:
CMAKE_OPTIONS="-DDISABLE_ORACLE_SUPPORT:BOOL=ON";
fi
before_script:
- export CTA_BUILD_ID=${CI_PIPELINE_ID}git${CI_COMMIT_SHA:0:8}
- echo "Exporting CTA_BUILD_ID=${CTA_BUILD_ID}"
- test -n "${CI_COMMIT_TAG}" && export TAG_VERSION=$(echo ${CI_COMMIT_TAG} | sed -e 's/^v//;s/-.*$//')
- test -n "${CI_COMMIT_TAG}" && export TAG_RELEASE=$(echo ${CI_COMMIT_TAG} | sed -e 's/^[^-]*-//')
- major_version=$(echo ${TAG_VERSION} | cut -d. -f1)
- if [[ ${major_version} == 5 ]];
then echo "Setting to compile with XRootD version 5";
XROOTD_VERSION=5;
fi
- *prepare-xrootd5
- *prepare-scheduler-type
- *prepare-no-oracle
default:
interruptible: true
before_script:
- export CTA_BUILD_ID=${CI_PIPELINE_ID}git${CI_COMMIT_SHA:0:8}
- echo "Exporting CTA_BUILD_ID=${CTA_BUILD_ID}"
- test -n "${CI_COMMIT_TAG}" && export TAG_VERSION=$(echo ${CI_COMMIT_TAG} | sed -e 's/^v//;s/-.*$//')
- test -n "${CI_COMMIT_TAG}" && export TAG_RELEASE=$(echo ${CI_COMMIT_TAG} | sed -e 's/^[^-]*-//')
- major_version=$(echo ${TAG_VERSION} | cut -d. -f1)
- if [[ ${major_version} == 5 ]];
then echo "Setting to compile with XRootD version 5";
XROOTD_VERSION=5;
fi
- *prepare-xrootd5
- *prepare-scheduler-type
- *prepare-no-oracle
include:
- local: .gitlab/ci/*.gitlab-ci.yml
......@@ -7,6 +7,7 @@
- cta/CTA#7 - Use same versionlock.list file for xrootd4 and 5
- cta/CTA#18 - CI - Testing of DB schema upgrade script
- cta/CTA#49 - Clean up orchestration test scripts
- cta/CTA#101 - CI should cancel running jobs for a branch after a force push
### Building and Packaging
- cta/CTA#92 - Refactor CTA code so that it can be build without Oracle dependencies
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment