diff --git a/documentation/chapters/templates/java/gradle/gradle-test-template.adoc b/documentation/chapters/templates/java/gradle/gradle-test-template.adoc index ec4b0e7..3572476 100644 --- a/documentation/chapters/templates/java/gradle/gradle-test-template.adoc +++ b/documentation/chapters/templates/java/gradle/gradle-test-template.adoc @@ -23,5 +23,5 @@ image::GitlabCiTest.png[] .gradle-test-template [source,yaml] ---- -include::{sourcedir}java/gradle/gradle-test.gitlab-ci.yml[] +include::{sourcedir}java/gradle/gradle-verify.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/java/maven/maven-verify-template.adoc b/documentation/chapters/templates/java/maven/maven-verify-template.adoc index c971c4e..75796bf 100644 --- a/documentation/chapters/templates/java/maven/maven-verify-template.adoc +++ b/documentation/chapters/templates/java/maven/maven-verify-template.adoc @@ -23,5 +23,5 @@ image::GitlabCiTest.png[] .mvn-verify-template [source, yaml] ---- -include::{sourcedir}/java/maven/maven-test.gitlab-ci.yml[] +include::{sourcedir}/java/maven/maven-verify.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/chapters/templates/npm/npm-test-template.adoc b/documentation/chapters/templates/npm/npm-test-template.adoc index 8e61106..764b755 100644 --- a/documentation/chapters/templates/npm/npm-test-template.adoc +++ b/documentation/chapters/templates/npm/npm-test-template.adoc @@ -15,5 +15,5 @@ This template will run your NPM unit tests .npm-test-template [source, yaml] ---- -include::{sourcedir}npm/npm-test.gitlab-ci.yml[] +include::{sourcedir}npm/npm-verify.gitlab-ci.yml[] ---- \ No newline at end of file diff --git a/documentation/generalInformation.adoc b/documentation/generalInformation.adoc index 93d951e..b8a5223 100644 --- a/documentation/generalInformation.adoc +++ b/documentation/generalInformation.adoc @@ -46,7 +46,7 @@ include: - project: 'gilden/ci/gitlab-ci-templates' ref: '2.0.0' file: - - '/templates/java/maven/maven-test.gitlab-ci.yml' + - '/templates/java/maven/maven-verify.gitlab-ci.yml' test-image: stage: test-image diff --git a/pipelines/java-gradle.gitlab-ci.yml b/pipelines/java-gradle.gitlab-ci.yml index e99b20a..dd75ade 100644 --- a/pipelines/java-gradle.gitlab-ci.yml +++ b/pipelines/java-gradle.gitlab-ci.yml @@ -1,6 +1,6 @@ include: - '/templates/java/gradle/gradle-build.gitlab-ci.yml' - - '/templates/java/gradle/gradle-test.gitlab-ci.yml' + - '/templates/java/gradle/gradle-verify.gitlab-ci.yml' - '/templates/static-analysis/repo-cve-scan-trivy.gitlab-ci.yml' - '/templates/static-analysis/sonar.gitlab-ci.yml' diff --git a/pipelines/java-maven.gitlab-ci.yml b/pipelines/java-maven.gitlab-ci.yml index e9eda45..7e32e7f 100644 --- a/pipelines/java-maven.gitlab-ci.yml +++ b/pipelines/java-maven.gitlab-ci.yml @@ -1,7 +1,7 @@ include: - '/templates/java/maven/maven-dependencies.gitlab-ci.yml' - '/templates/java/maven/maven-build.gitlab-ci.yml' - - '/templates/java/maven/maven-test.gitlab-ci.yml' + - '/templates/java/maven/maven-verify.gitlab-ci.yml' - '/templates/java/maven/maven-database-diff.gitlab-ci.yml' - '/templates/static-analysis/repo-cve-scan-trivy.gitlab-ci.yml' - '/templates/static-analysis/sonar.gitlab-ci.yml' diff --git a/templates/java/gradle/gradle-test.gitlab-ci.yml b/templates/java/gradle/gradle-verify.gitlab-ci.yml similarity index 93% rename from templates/java/gradle/gradle-test.gitlab-ci.yml rename to templates/java/gradle/gradle-verify.gitlab-ci.yml index c1cb1e2..d8fd92d 100644 --- a/templates/java/gradle/gradle-test.gitlab-ci.yml +++ b/templates/java/gradle/gradle-verify.gitlab-ci.yml @@ -1,4 +1,4 @@ -.gradle-test: +.gradle-verify: image: $GRADLE_IMAGE stage: verify script: diff --git a/templates/java/maven/maven-build.gitlab-ci.yml b/templates/java/maven/maven-build.gitlab-ci.yml index 764594e..01efa35 100644 --- a/templates/java/maven/maven-build.gitlab-ci.yml +++ b/templates/java/maven/maven-build.gitlab-ci.yml @@ -8,6 +8,7 @@ mvn $MVN_EXTRA_ARGS $MAVEN_CLI_OPTS versions:set -DnewVersion=$CI_COMMIT_TAG -DgenerateBackupPoms=false fi script: + - "cd $BACKEND_DIR" - mvn $MAVEN_CLI_OPTS package -DskipTests artifacts: expire_in: 2 weeks diff --git a/templates/java/maven/maven-test.gitlab-ci.yml b/templates/java/maven/maven-verify.gitlab-ci.yml similarity index 94% rename from templates/java/maven/maven-test.gitlab-ci.yml rename to templates/java/maven/maven-verify.gitlab-ci.yml index 6ecd5dc..ce8647a 100644 --- a/templates/java/maven/maven-test.gitlab-ci.yml +++ b/templates/java/maven/maven-verify.gitlab-ci.yml @@ -1,4 +1,4 @@ -.maven-test: +.maven-verify: image: $MAVEN_IMAGE stage: verify script: diff --git a/templates/npm/npm-test.gitlab-ci.yml b/templates/npm/npm-verify.gitlab-ci.yml similarity index 95% rename from templates/npm/npm-test.gitlab-ci.yml rename to templates/npm/npm-verify.gitlab-ci.yml index ab0d48f..93a7579 100644 --- a/templates/npm/npm-test.gitlab-ci.yml +++ b/templates/npm/npm-verify.gitlab-ci.yml @@ -1,4 +1,4 @@ -.npm-test: +.npm-verify: image: $NODE_IMAGE stage: verify variables: