aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kollmann <christian.kollmann@a-sit.at>2021-11-30 15:49:49 +0100
committerChristian Kollmann <christian.kollmann@a-sit.at>2021-12-01 09:30:06 +0100
commit17e4921691dd51705e110d0ec5a8635699c510b8 (patch)
tree4656cf6c15b6c4e46fe23a9cc809f2698615fc9e
parent485bfe1baa0013ef5e13921d270c48bb7cc7cf77 (diff)
downloadNational_eIDAS_Gateway-17e4921691dd51705e110d0ec5a8635699c510b8.tar.gz
National_eIDAS_Gateway-17e4921691dd51705e110d0ec5a8635699c510b8.tar.bz2
National_eIDAS_Gateway-17e4921691dd51705e110d0ec5a8635699c510b8.zip
CI: Refactor script
-rw-r--r--.gitlab-ci.yml16
1 files changed, 7 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cecaf7f..df21e049 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,10 @@ include:
- template: Dependency-Scanning.gitlab-ci.yml
- template: Secret-Detection.gitlab-ci.yml
+default:
+ tags:
+ - docker
+
stages:
- assemble
- test
@@ -30,14 +34,12 @@ cache:
assemble:
stage: assemble
- tags:
- - docker
except:
- tags
script: |
mvn $MAVEN_CLI_OPTS generate-sources compile test
after_script:
- - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, " instructions covered"; print 100*covered/instructions, "% covered" }' $JACOCO_CSV_LOCATION
+ - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, " instructions covered"; print 100*covered/instructions, "% covered" }' $JACOCO_CSV_LOCATION
coverage: '/([0-9]{1,3}.[0-9]*).%.covered/'
artifacts:
when: always
@@ -50,8 +52,6 @@ assemble:
buildDistributionPackage:
stage: package
- tags:
- - docker
except:
- tags
- /^feature/.*$/i
@@ -64,15 +64,13 @@ buildDistributionPackage:
name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}"
when: always
reports:
- dotenv: variables.env
+ dotenv: variables.env
paths:
- $PROJECT_RELEASE_PACKAGE
release:
stage: release
image: registry.gitlab.com/gitlab-org/release-cli:latest
- tags:
- - docker
needs:
- job: buildDistributionPackage
artifacts: true
@@ -87,4 +85,4 @@ release:
name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}-release"
expire_in: never
paths:
- - $PROJECT_RELEASE_PACKAGE
+ - $PROJECT_RELEASE_PACKAGE