From 16c02f77e06393b7cc731f003366138bf14d1c19 Mon Sep 17 00:00:00 2001 From: daniele caldarini Date: Tue, 13 Aug 2024 11:04:25 +0200 Subject: [PATCH] Issue #1071: fixed resources validator build image job --- .gitlab/.gitlab-ci-entity-manager.yaml | 8 ++++---- .gitlab/.gitlab-ci-resources-validator.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/.gitlab-ci-entity-manager.yaml b/.gitlab/.gitlab-ci-entity-manager.yaml index 36afba05f..360754ea0 100644 --- a/.gitlab/.gitlab-ci-entity-manager.yaml +++ b/.gitlab/.gitlab-ci-entity-manager.yaml @@ -49,13 +49,13 @@ Build Entity-Manager image: echo "$VERSION" > $CI_PROJECT_DIR/.version - | if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true + ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true elif [[ "$CI_COMMIT_BRANCH" =~ ^\d+-.*$ && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=998-SNAPSHOT -P 'exclude-quarkus-test' + ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=998-SNAPSHOT -P 'exclude-quarkus-test' elif [[ "$CI_COMMIT_BRANCH" =~ ^\d+-.*$ ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test' + ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test' elif [[ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false + ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false fi artifacts: paths: diff --git a/.gitlab/.gitlab-ci-resources-validator.yaml b/.gitlab/.gitlab-ci-resources-validator.yaml index b2ecec414..6087bce86 100644 --- a/.gitlab/.gitlab-ci-resources-validator.yaml +++ b/.gitlab/.gitlab-ci-resources-validator.yaml @@ -48,13 +48,13 @@ Build Resource-Validator image: echo "$VERSION" > $CI_PROJECT_DIR/.version - | if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/resource-validator -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true + ./mvnw package $MAVEN_CLI_OPTS -pl app/resources-validator -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true elif [[ "$CI_COMMIT_BRANCH" =~ ^\d+-.*$ && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/resource-validator -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=998-SNAPSHOT -P 'exclude-quarkus-test' + ./mvnw package $MAVEN_CLI_OPTS -pl app/resources-validator -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=998-SNAPSHOT -P 'exclude-quarkus-test' elif [[ "$CI_COMMIT_BRANCH" =~ ^\d+-.*$ ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/resource-validator -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test' + ./mvnw package $MAVEN_CLI_OPTS -pl app/resources-validator -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test' elif [[ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]]; then - ./mvnw package $MAVEN_CLI_OPTS -pl ../vendor/hibernate-rx-multitenancy/deployment,app/resource-validator -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test' + ./mvnw package $MAVEN_CLI_OPTS -pl app/resources-validator -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test' fi artifacts: paths: