Merge branch 'checking-zpp-solvers' into 'rc3.1'

Checking zpp solvers

See merge request !10

.gitlab-ci.yml

@@ -32,6 +32,7 @@ variables:
   ADAPTER_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f adapter/pom.xml"
   CP_GENERATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp_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"
   GEN_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f zpp-solver/genetic-solver/pom.xml"
   NC_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f zpp-solver/node-candidates-solver/pom.xml"
@@ -99,7 +100,7 @@ build:jwt-commons:
   script:
     - $JWT_COMMONS_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/jwt-commons/target
 
 build:melodic-commons:
@@ -180,7 +181,7 @@ build:dlms-agent:
   script:
     - $DLMS_AGENT_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/dlmsAgent/target
 
 build:ems:
@@ -189,7 +190,7 @@ build:ems:
   script:
     - $EMS_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/target
 
 build:ems-util:
@@ -198,7 +199,7 @@ build:ems-util:
   script:
     - $EMS_UTIL_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/util/target
 
 build:ems-broker-client:
@@ -207,7 +208,7 @@ build:ems-broker-client:
   script:
     - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/broker-client/target
 
 build:ems-broker-cep:
@@ -216,7 +217,7 @@ build:ems-broker-cep:
   script:
     - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/broker-cep/target
 
 build:ems-baguette-client:
@@ -227,14 +228,14 @@ build:ems-baguette-client:
   artifacts:
     paths:
     - $CI_PROJECT_DIR/event-management/baguette-client/target
-  
+
 build:ems-baguette-server:
   stage: build
   image: $MAVEN_IMAGE
   script:
     - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/baguette-server/target
 
 build:ems-baguette-client-install:
@@ -243,7 +244,7 @@ build:ems-baguette-client-install:
   script:
     - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/baguette-client-install/target
 
 build:ems-translator:
@@ -252,7 +253,7 @@ build:ems-translator:
   script:
     - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install
   artifacts:
-    paths: 
+    paths:
     - $CI_PROJECT_DIR/event-management/translator/target
 
 deploy:melodic-upperware:
@@ -285,14 +286,14 @@ deploy:upperware-metamodel:
 
 deploy:jwt-commons:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:jwt-commons
   script:
     - $DOCKER_CLI $JWT_COMMONS_CLI deploy
@@ -399,14 +400,14 @@ deploy:penalty-calculator:
 
 deploy:jwt-server:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $JWT_SERVER_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/jwtserver:unknown $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH
@@ -442,14 +443,14 @@ deploy:zpp-solver:
 
 deploy:adapter:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $ADAPTER_SERVER_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/adapter:unknown $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH
@@ -457,14 +458,14 @@ deploy:adapter:
 
 deploy:cp-generator:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $CP_GENERATOR_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/generator:unknown $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH
@@ -506,131 +507,145 @@ deploy:dlms-agent:
 
 deploy:ems:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems
   script:
     - $DOCKER_CLI $EMS_CLI deploy
 
 deploy:ems-util:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-util
   script:
     - $DOCKER_CLI $EMS_UTIL_CLI deploy
 
 deploy:ems-broker-client:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-broker-client
   script:
     - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy
 
 deploy:ems-broker-cep:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-broker-cep
   script:
     - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy
 
 deploy:ems-baguette-client:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-baguette-client
   script:
     - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy
 
 deploy:ems-baguette-server:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-baguette-server
   script:
     - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy
 
 deploy:ems-baguette-client-install:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-baguette-client-install
   script:
     - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy
 
 deploy:ems-translator:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  dependencies: 
+  dependencies:
     - build:ems-translator
   script:
     - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy
 
 deploy:ems-server:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $EMS_SERVER_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/ems-server:UNKNOWN $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH
     - docker push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH
 
+deploy:cp-parser:
+  stage: deploy
+  only:
+    - master
+    - rc3.0
+    - rc3.1
+  image: $DOCKER_DIND_IMAGE
+  services:
+    - $DOCKER_DIND_SERVICE
+  dependencies:
+    - build:cp-solver
+  script:
+    - $DOCKER_CLI $CP_PARSER_CLI -Ddocker.imagePrefix=melodic/ clean install
+
 deploy:gen-solver:
   stage: deploy
   only: 
@@ -650,14 +665,14 @@ deploy:gen-solver:
 
 deploy:metasolver:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $METASOLVER_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/metasolver:unknown $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH
@@ -665,14 +680,14 @@ deploy:metasolver:
 
 deploy:mq-adapter:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $MQ_ADAPTER_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/mq-http-adapter:unknown $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH
@@ -731,14 +746,14 @@ deploy:mcts-solver:
 
 deploy:gui-backend:
   stage: deploy
-  only: 
+  only:
     - master
     - rc3.0
     - rc3.1
   image: $DOCKER_DIND_IMAGE
   services:
     - $DOCKER_DIND_SERVICE
-  script: 
+  script:
     - $DOCKER_CLI $GUI_BACKEND_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/gui-backend:unknown $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH

zpp-solver/node-candidates-solver/src/test/java/NCSolverTest.java

@@ -281,4 +281,4 @@ class NCSolverTest {
         assertTrue(solution.extractVMConfiguration(1).equals(new VMConfiguration(4,3,3)));
     }
 
-}
\ No newline at end of file
+}

zpp-solver/pom.xml

@@ -51,4 +51,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>