Merge remote-tracking branch 'origin/proactive-dev-2.5' into proactive-dev-2.5

.gitlab-ci.yml

@@ -17,6 +17,11 @@ variables:
   MQ_ADAPTER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f mq-http-adapter/pom.xml"
   GUI_BACKEND_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -U -f gui-backend/pom.xml"
 
+  UTILITY_GENERATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f utility-generator/pom.xml"
+
+  CP_PARSER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f zpp-solver/cp-parser/pom.xml"
+  CP_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp-solver/pom.xml"
+
 cache:
   paths:
     - maven_repo/
@@ -40,6 +45,8 @@ stages:
   - build-basic-dependencies
   - build-required-part2
   - build-required-part3
+  - build-required-part5
+  - build-required-part6  
   - deploy
 
 build-required-part2:melodic-commons:
@@ -62,6 +69,26 @@ build-required-part3:melodic-cache:
     paths:
       - /builds/melodic/melodic-upperware/maven_repo/org/ow2/paasage/melodic-cache/
 
+build-required-part5:utility-generator:
+  stage: build-required-part5
+  image: $MAVEN_IMAGE
+  script:
+    - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/utility-generator/
+
+build-required-part6:cp-solver:
+  stage: build-required-part6
+  image: $MAVEN_IMAGE
+  script:
+    - $CP_SOLVER_CLI -Pwithout-docker clean install
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/cp-solver/
+
 deploy:melodic-commons:
   stage: deploy
   only:
@@ -74,6 +101,19 @@ deploy:melodic-commons:
   script:
     - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy
 
+deploy:utility-generator:
+  stage: deploy
+  only:
+    - proactive-dev-2.5
+  image: $DOCKER_DIND_IMAGE
+  services:
+    - $DOCKER_DIND_SERVICE
+  dependencies:
+    - build-required-part5:utility-generator
+    - build-required-part3:melodic-cache
+  script:
+    - $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy
+
 deploy:melodic-cache:
   stage: deploy
   only:
@@ -112,6 +152,22 @@ deploy:cp-generator:
     - docker tag $LOCAL_REPO/melodic/generator:unknown $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH
     - docker push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH
 
+deploy:cp-solver:
+  stage: deploy
+  only:
+    - proactive-dev-2.5
+  image: $DOCKER_DIND_IMAGE
+  dependencies:
+    - build-required-part6:cp-solver
+  services:
+    - $DOCKER_DIND_SERVICE
+  script:
+    - $DOCKER_CLI $CP_SOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install
+    - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
+    - docker tag $LOCAL_REPO/melodic/cpsolver:unknown $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH
+    - docker push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH
+    - $DOCKER_CLI $CP_SOLVER_CLI deploy
+
 deploy:mq-adapter:
   stage: deploy
   only: