Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
fb59631f
Commit
fb59631f
authored
2 years ago
by
Jorge Camarero Vera
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "CI should cancel running jobs for a branch after a force push"
parent
019b4d84
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+15
-13
15 additions, 13 deletions
.gitlab-ci.yml
ReleaseNotes.md
+1
-0
1 addition, 0 deletions
ReleaseNotes.md
with
16 additions
and
13 deletions
.gitlab-ci.yml
+
15
−
13
View file @
fb59631f
...
...
@@ -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
This diff is collapsed.
Click to expand it.
ReleaseNotes.md
+
1
−
0
View file @
fb59631f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment