Commit 7710e143 authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

Merge branch 'rc3.1' into 'master'

Rc3.1

See merge request melodic/melodic-upperware!14
parents 6b78216f ba1fa74e
Pipeline #19882 passed with stages
in 22 minutes and 19 seconds
......@@ -20,4 +20,9 @@ build/
nbbuild/
dist/
nbdist/
.nb-gradle/
\ No newline at end of file
.nb-gradle/
### MCTS tree printing ###
zpp-solver/testing_module/src/main/resources/nodes*
zpp-solver/testing_module/src/main/resources/tree*
\ No newline at end of file
......@@ -26,9 +26,19 @@ variables:
PENALTY_CALCULATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f penalty-calculator/pom.xml"
JWT_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f jwt-server/pom.xml"
UTILITY_GENERATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f utility-generator/pom.xml"
ZPP_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f zpp-solver/pom.xml"
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"
PT_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f zpp-solver/pt-solver/pom.xml"
MCTS_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f zpp-solver/mcts-solver/pom.xml"
DLMS_AGENT_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f dlmsAgent/pom.xml"
EMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/pom.xml"
......@@ -44,6 +54,9 @@ variables:
METASOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f meta_solver/pom.xml"
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 -f gui-backend/pom.xml"
FUNCTIONIZER_TESTING_TOOL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f functionizer-testing-tool/pom.xml"
cache:
paths:
- maven_repo/
......@@ -63,8 +76,17 @@ after_script:
- docker image ls
- echo '=========================================================================='
build:melodic-upperware:
stage: build
stages:
- build-basic-dependencies
- build-required-part1
- build-required-part2
- build-required-part3
- build-required-part4
- build
- deploy
build-basic-dependencies:melodic-upperware:
stage: build-basic-dependencies
image: $MAVEN_IMAGE
script:
- $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install
......@@ -72,8 +94,8 @@ build:melodic-upperware:
paths:
- $CI_PROJECT_DIR/upperware/target
build:upperware-metamodel:
stage: build
build-required-part1:upperware-metamodel:
stage: build-required-part1
image: $MAVEN_IMAGE
script:
- $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install
......@@ -81,8 +103,8 @@ build:upperware-metamodel:
paths:
- $CI_PROJECT_DIR/upperware_metamodel/target
build:jwt-commons:
stage: build
build-required-part2:jwt-commons:
stage: build-required-part2
image: $MAVEN_IMAGE
script:
- $JWT_COMMONS_CLI -Pwithout-docker clean install
......@@ -90,8 +112,8 @@ build:jwt-commons:
paths:
- $CI_PROJECT_DIR/jwt-commons/target
build:melodic-commons:
stage: build
build-required-part2:melodic-commons:
stage: build-required-part2
image: $MAVEN_IMAGE
script:
- $MELODIC_COMMONS_CLI -Pwithout-docker clean install
......@@ -99,35 +121,44 @@ build:melodic-commons:
paths:
- $CI_PROJECT_DIR/melodic-commons/target
build:melodic-cache:
stage: build
build-required-part3:zpp-solver:
stage: build-required-part3
image: $MAVEN_IMAGE
script:
- $MELODIC_CACHE_CLI -Pwithout-docker clean install
- $ZPP_SOLVER_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/melodic-cache/target
- $CI_PROJECT_DIR/zpp-solver/target
build:dlms:
stage: build
build-required-part3:dlms:
stage: build-required-part3
image: $MAVEN_IMAGE
script:
- $DLMS_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/dlms/target
- $CI_PROJECT_DIR/dlms/target
build:dlms-utility:
stage: build
build-required-part4:dlms-utility:
stage: build-required-part4
image: $MAVEN_IMAGE
script:
- $DLMS_UTILITY_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/dlms/DLMSUtility/target
- $CI_PROJECT_DIR/dlms/DLMSUtility/target
build:penalty-calculator:
stage: build
build-required-part4:cp-solver:
stage: build-required-part4
image: $MAVEN_IMAGE
script:
- $CP_SOLVER_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/cp-solver/target
build-required-part3:penalty-calculator:
stage: build-required-part3
image: $MAVEN_IMAGE
script:
- $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install
......@@ -135,8 +166,8 @@ build:penalty-calculator:
paths:
- $CI_PROJECT_DIR/penalty-calculator/target
build:utility-generator:
stage: build
build-required-part3:utility-generator:
stage: build-required-part3
image: $MAVEN_IMAGE
script:
- $UTILITY_GENERATOR_CLI -Pwithout-docker clean install
......@@ -144,26 +175,45 @@ build:utility-generator:
paths:
- $CI_PROJECT_DIR/utility-generator/target
build:dlms-agent:
build-required-part3:ems:
stage: build-required-part3
image: $MAVEN_IMAGE
script:
- $EMS_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/event-management/target
build:melodic-cache:
stage: build
image: $MAVEN_IMAGE
script:
- $DLMS_AGENT_CLI -Pwithout-docker clean install
- $MELODIC_CACHE_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/dlmsAgent/target
- $CI_PROJECT_DIR/melodic-cache/target
build:ems:
build:dlms-agent:
stage: build
image: $MAVEN_IMAGE
script:
- $EMS_CLI -Pwithout-docker clean install
- $DLMS_AGENT_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/event-management/target
- $CI_PROJECT_DIR/dlmsAgent/target
build:ems-util:
build:cp-parser:
stage: build
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build-required-part4:cp-solver
script:
- $DOCKER_CLI $CP_PARSER_CLI -Pwithout-docker clean install
build-required-part4:ems-util:
stage: build-required-part4
image: $MAVEN_IMAGE
script:
- $EMS_UTIL_CLI -Pwithout-docker clean install
......@@ -174,6 +224,8 @@ build:ems-util:
build:ems-broker-client:
stage: build
image: $MAVEN_IMAGE
dependencies:
- build-required-part4:ems-util
script:
- $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install
artifacts:
......@@ -222,48 +274,77 @@ build:ems-translator:
paths:
- $CI_PROJECT_DIR/event-management/translator/target
build:ems-server:
stage: build
image: $MAVEN_IMAGE
script:
- $EMS_SERVER_CLI -Pwithout-docker clean install
artifacts:
paths:
- $CI_PROJECT_DIR/event-management/control-service/target
deploy:melodic-upperware:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:melodic-upperware
- build-basic-dependencies:melodic-upperware
script:
- $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy
deploy:upperware-metamodel:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:upperware-metamodel
- build-required-part1:upperware-metamodel
script:
- $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy
deploy:jwt-commons:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:jwt-commons
- build-required-part2:jwt-commons
script:
- $DOCKER_CLI $JWT_COMMONS_CLI deploy
deploy:melodic-commons:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:melodic-commons
- build-required-part2:melodic-commons
script:
- $DOCKER_CLI $MELODIC_COMMONS_CLI deploy
deploy:melodic-cache:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -274,112 +355,171 @@ deploy:melodic-cache:
deploy:dlms:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:dlms
- build-required-part3:dlms
script:
- $DOCKER_CLI $DLMS_CLI deploy
deploy:dlms-utility:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:dlms-utility
- build-required-part4:dlms-utility
script:
- $DOCKER_CLI $DLMS_UTILITY_CLI deploy
deploy:dlms-controller:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
script:
- $DOCKER_CLI $DLMS_CONTROLLER_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/dlms-controller $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH
- docker tag $LOCAL_REPO/melodic/dlms-controller:unknown $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH
deploy:dlms-webservice:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
script:
- $DOCKER_CLI $DLMS_WEB_SERVICE_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/dlms-webservice $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH
- docker tag $LOCAL_REPO/melodic/dlms-webservice:unknown $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH
deploy:penalty-calculator:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:penalty-calculator
- build-required-part3:penalty-calculator
script:
- $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy
deploy:jwt-server:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
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 $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH
- docker tag $LOCAL_REPO/melodic/jwtserver:unknown $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH
deploy:utility-generator:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:utility-generator
- build-required-part3:utility-generator
script:
- $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy
deploy:zpp-solver:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build-required-part3:zpp-solver
script:
- $DOCKER_CLI $ZPP_SOLVER_CLI deploy
deploy:adapter:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
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 $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH
- docker tag $LOCAL_REPO/melodic/adapter:unknown $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH
deploy:cp-generator:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
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 $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH
- 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:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
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 $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH
- 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:dlms-agent:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: "python:latest"
before_script:
- pip install awscli
......@@ -391,30 +531,42 @@ deploy:dlms-agent:
- export AWS_DEFAULT_REGION=eu-west-1
- ls -l $CI_PROJECT_DIR/dlmsAgent
- ls -l $CI_PROJECT_DIR/dlmsAgent/target
- aws s3 cp $CI_PROJECT_DIR/dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/
- aws s3 cp $CI_PROJECT_DIR/dlmsAgent/target/DLMSAgent-3.1.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/
deploy:ems:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:ems
- build-required-part3:ems
script:
- $DOCKER_CLI $EMS_CLI deploy
deploy:ems-util:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build:ems-util
- build-required-part4:ems-util
script:
- $DOCKER_CLI $EMS_UTIL_CLI deploy
deploy:ems-broker-client:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -425,6 +577,10 @@ deploy:ems-broker-client:
deploy:ems-broker-cep:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -435,6 +591,10 @@ deploy:ems-broker-cep:
deploy:ems-baguette-client:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -445,6 +605,10 @@ deploy:ems-baguette-client:
deploy:ems-baguette-server:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -455,6 +619,10 @@ deploy:ems-baguette-server:
deploy:ems-baguette-client-install:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -465,6 +633,10 @@ deploy:ems-baguette-client-install:
deploy:ems-translator:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
......@@ -475,44 +647,161 @@ deploy:ems-translator:
deploy:ems-server:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
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 $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH
- 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-parser
script:
- $DOCKER_CLI $CP_PARSER_CLI -Ddocker.imagePrefix=melodic/ clean install
deploy:gen-solver:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
dependencies:
- build-required-part4:cp-solver
- build:cp-parser
script:
- $DOCKER_CLI $GEN_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/geneticsolver:unknown $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH
deploy:metasolver:
stage: deploy
only:
- master
- rc3.0
- rc3.1
image: $DOCKER_DIND_IMAGE
services:
- $DOCKER_DIND_SERVICE
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 $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH
- docker tag $LOCAL_REPO/melodic/metasolver:unknown $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH