Issue #1075: put merge request condition before feature branch condit…

…ion #2
smclab · Aug 14, 2024 · f1b37f9 · f1b37f9
1 parent e28af80
commit f1b37f9
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 22 deletions.
diff --git a/.gitlab/.gitlab-ci-entity-manager.yaml b/.gitlab/.gitlab-ci-entity-manager.yaml
@@ -51,12 +51,12 @@ Build Entity-Manager image:
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then                                               
         ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./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_MERGE_REQUEST_ID" ]]; then
-        ./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-file-manager.yaml b/.gitlab/.gitlab-ci-file-manager.yaml
@@ -50,12 +50,12 @@ Build File-Manager image:
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/file-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/file-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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/file-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test'
-      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/file-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test'
       fi
   artifacts:
     paths:

diff --git a/.gitlab/.gitlab-ci-ingestion.yaml b/.gitlab/.gitlab-ci-ingestion.yaml
@@ -49,7 +49,9 @@ Build Ingestion image:
     - FEATURE_BRANCH_REGEX='^\d+-.*$'
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/ingestion -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -P 'exclude-quarkus-test'
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/ingestion -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/ingestion -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" =~ $(FEATURE_BRANCH_REGEX) ]]; then

diff --git a/.gitlab/.gitlab-ci-k8s-client.yaml b/.gitlab/.gitlab-ci-k8s-client.yaml
@@ -49,12 +49,12 @@ Build K8S-Client image:
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/k8s-client -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/k8s-client -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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/k8s-client -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test'
-      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/k8s-client -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test'
       fi
   artifacts:
     paths:

diff --git a/.gitlab/.gitlab-ci-resources-validator.yaml b/.gitlab/.gitlab-ci-resources-validator.yaml
@@ -49,13 +49,13 @@ Build Resource-Validator image:
     - FEATURE_BRANCH_REGEX='^\d+-.*$'
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/resources-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_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./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_MERGE_REQUEST_ID" ]]; then
-        ./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:

diff --git a/.gitlab/.gitlab-ci-searcher.yaml b/.gitlab/.gitlab-ci-searcher.yaml
@@ -49,13 +49,13 @@ Build Searcher Image:
     - FEATURE_BRANCH_REGEX='^\d+-.*$'
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/searcher -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true 
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/searcher -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/searcher -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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/searcher -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test'
-      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/searcher -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test'
       fi
   artifacts:
     paths:

diff --git a/.gitlab/.gitlab-ci-tenant-manager.yaml b/.gitlab/.gitlab-ci-tenant-manager.yaml
@@ -49,13 +49,13 @@ Build Tenant-Manager image:
     - FEATURE_BRANCH_REGEX='^\d+-.*$'
     - |
       if [[ "$CI_COMMIT_BRANCH" == "main" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/tenant-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true 
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/tenant-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/tenant-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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/tenant-manager -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test'
-      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/tenant-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test'
       fi
   artifacts:
     paths:

diff --git a/.gitlab/.gitlab-ci-tika-no-ocr.yaml b/.gitlab/.gitlab-ci-tika-no-ocr.yaml
@@ -49,13 +49,13 @@ Build Tika no-ocr:
     - FEATURE_BRANCH_REGEX='^\d+-.*$'
     - |
       if [[ "$CI_COMMIT_TAG" || "$CI_COMMIT_BRANCH" == "main" || "$CI_COMMIT_BRANCH" == "608-flusso-pipeline-devops" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-no-ocr -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true 
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-no-ocr -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-no-ocr -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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-no-ocr -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test'
-      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-no-ocr -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test'
       fi
   artifacts:
     paths:

diff --git a/.gitlab/.gitlab-ci-tika-ocr.yaml b/.gitlab/.gitlab-ci-tika-ocr.yaml
@@ -49,13 +49,13 @@ Build Tika ocr:
     - FEATURE_BRANCH_REGEX='^\d+-.*$'
     - |
       if [[ "$CI_COMMIT_TAG" || "$CI_COMMIT_BRANCH" == "main" || "$CI_COMMIT_BRANCH" == "608-flusso-pipeline-devops" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-ocr -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true 
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-ocr -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true
+      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
+        ./mvnw package $MAVEN_CLI_OPTS -pl app/entity-manager -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
       elif [[ "$CI_COMMIT_BRANCH" =~ $(FEATURE_BRANCH_REGEX) && "$CI_COMMIT_AUTHOR" == "michele.bastianelli" ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-ocr -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" =~ $(FEATURE_BRANCH_REGEX) ]]; then
         ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-ocr -am -Dquarkus.container-image.build=true -Dquarkus.container-image.push=true -Dquarkus.container-image.tag=999-SNAPSHOT -P 'exclude-quarkus-test'
-      elif [[ "$CI_MERGE_REQUEST_ID" ]]; then
-        ./mvnw package $MAVEN_CLI_OPTS -pl app/tika/tika-ocr -am -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false -P 'exclude-quarkus-test'
       fi
   artifacts:
     paths: