Commit 512c5f21 authored by mriedl's avatar mriedl
Browse files

Merge ready version

parent cfe78861
Pipeline #10515 canceled with stages
in 3 minutes and 27 seconds
...@@ -94,14 +94,14 @@ build:upperware-metamodel: ...@@ -94,14 +94,14 @@ build:upperware-metamodel:
paths: paths:
- $CI_PROJECT_DIR/upperware_metamodel/target - $CI_PROJECT_DIR/upperware_metamodel/target
#build:jwt-commons: build:jwt-commons:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $JWT_COMMONS_CLI -Pwithout-docker clean install - $JWT_COMMONS_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/jwt-commons/target - $CI_PROJECT_DIR/jwt-commons/target
build:melodic-commons: build:melodic-commons:
stage: build stage: build
...@@ -184,77 +184,77 @@ build:dlms-agent: ...@@ -184,77 +184,77 @@ build:dlms-agent:
paths: paths:
- $CI_PROJECT_DIR/dlmsAgent/target - $CI_PROJECT_DIR/dlmsAgent/target
#build:ems: build:ems:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_CLI -Pwithout-docker clean install - $EMS_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/target - $CI_PROJECT_DIR/event-management/target
#
#build:ems-util: build:ems-util:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_UTIL_CLI -Pwithout-docker clean install - $EMS_UTIL_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/util/target - $CI_PROJECT_DIR/event-management/util/target
#
#build:ems-broker-client: build:ems-broker-client:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/broker-client/target - $CI_PROJECT_DIR/event-management/broker-client/target
#
#build:ems-broker-cep: build:ems-broker-cep:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/broker-cep/target - $CI_PROJECT_DIR/event-management/broker-cep/target
#
#build:ems-baguette-client: build:ems-baguette-client:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/baguette-client/target - $CI_PROJECT_DIR/event-management/baguette-client/target
#
#build:ems-baguette-server: build:ems-baguette-server:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/baguette-server/target - $CI_PROJECT_DIR/event-management/baguette-server/target
#
#build:ems-baguette-client-install: build:ems-baguette-client-install:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/baguette-client-install/target - $CI_PROJECT_DIR/event-management/baguette-client-install/target
#
#build:ems-translator: build:ems-translator:
# stage: build stage: build
# image: $MAVEN_IMAGE image: $MAVEN_IMAGE
# script: script:
# - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install
# artifacts: artifacts:
# paths: paths:
# - $CI_PROJECT_DIR/event-management/translator/target - $CI_PROJECT_DIR/event-management/translator/target
deploy:melodic-upperware: deploy:melodic-upperware:
stage: deploy stage: deploy
...@@ -283,20 +283,20 @@ deploy:upperware-metamodel: ...@@ -283,20 +283,20 @@ deploy:upperware-metamodel:
- build:upperware-metamodel - build:upperware-metamodel
script: script:
- $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy
#
#deploy:jwt-commons: deploy:jwt-commons:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:jwt-commons - build:jwt-commons
# script: script:
# - $DOCKER_CLI $JWT_COMMONS_CLI deploy - $DOCKER_CLI $JWT_COMMONS_CLI deploy
deploy:melodic-commons: deploy:melodic-commons:
stage: deploy stage: deploy
...@@ -401,21 +401,21 @@ deploy:penalty-calculator: ...@@ -401,21 +401,21 @@ deploy:penalty-calculator:
- build:penalty-calculator - build:penalty-calculator
script: script:
- $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy - $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy
#
#deploy:jwt-server: deploy:jwt-server:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# script: script:
# - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - $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 - 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 - 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 - docker push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH
deploy:utility-generator: deploy:utility-generator:
stage: deploy stage: deploy
...@@ -446,36 +446,36 @@ deploy:zpp-solver: ...@@ -446,36 +446,36 @@ deploy:zpp-solver:
- build:zpp-solver - build:zpp-solver
script: script:
- $DOCKER_CLI $ZPP_SOLVER_CLI deploy - $DOCKER_CLI $ZPP_SOLVER_CLI deploy
#
#deploy:adapter: deploy:adapter:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# script: script:
# - $DOCKER_CLI $ADAPTER_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - $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 - 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 - docker tag $LOCAL_REPO/melodic/adapter:unknown $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH
# - docker push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH
#
#deploy:cp-generator: deploy:cp-generator:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# script: script:
# - $DOCKER_CLI $CP_GENERATOR_CLI -Ddocker.imagePrefix=melodic/ clean install - $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 - 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 - docker tag $LOCAL_REPO/melodic/generator:unknown $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH
# - docker push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH
deploy:cp-solver: deploy:cp-solver:
stage: deploy stage: deploy
...@@ -513,132 +513,132 @@ deploy:dlms-agent: ...@@ -513,132 +513,132 @@ deploy:dlms-agent:
- ls -l $CI_PROJECT_DIR/dlmsAgent/target - ls -l $CI_PROJECT_DIR/dlmsAgent/target
- aws s3 cp $CI_PROJECT_DIR/dlmsAgent/target/DLMSAgent-3.1.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: deploy:ems:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems - build:ems
# script: script:
# - $DOCKER_CLI $EMS_CLI deploy - $DOCKER_CLI $EMS_CLI deploy
#
#deploy:ems-util: deploy:ems-util:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-util - build:ems-util
# script: script:
# - $DOCKER_CLI $EMS_UTIL_CLI deploy - $DOCKER_CLI $EMS_UTIL_CLI deploy
#
#deploy:ems-broker-client: deploy:ems-broker-client:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-broker-client - build:ems-broker-client
# script: script:
# - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy
#
#deploy:ems-broker-cep: deploy:ems-broker-cep:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-broker-cep - build:ems-broker-cep
# script: script:
# - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy
#
#deploy:ems-baguette-client: deploy:ems-baguette-client:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-baguette-client - build:ems-baguette-client
# script: script:
# - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy
#
#deploy:ems-baguette-server: deploy:ems-baguette-server:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-baguette-server - build:ems-baguette-server
# script: script:
# - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy
#
#deploy:ems-baguette-client-install: deploy:ems-baguette-client-install:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-baguette-client-install - build:ems-baguette-client-install
# script: script:
# - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy
#
#deploy:ems-translator: deploy:ems-translator:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# dependencies: dependencies:
# - build:ems-translator - build:ems-translator
# script: script:
# - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy
#
#deploy:ems-server: deploy:ems-server:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# script: script:
# - $DOCKER_CLI $EMS_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - $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 - 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 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 - docker push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH
deploy:cp-parser: deploy:cp-parser:
stage: deploy stage: deploy
...@@ -654,7 +654,7 @@ deploy:cp-parser: ...@@ -654,7 +654,7 @@ deploy:cp-parser:
- build:cp-solver - build:cp-solver
script: script:
- $DOCKER_CLI $CP_PARSER_CLI -Ddocker.imagePrefix=melodic/ clean install - $DOCKER_CLI $CP_PARSER_CLI -Ddocker.imagePrefix=melodic/ clean install
deploy:gen-solver: deploy:gen-solver:
stage: deploy stage: deploy
only: only:
...@@ -673,35 +673,35 @@ deploy:gen-solver: ...@@ -673,35 +673,35 @@ deploy:gen-solver:
- docker tag $LOCAL_REPO/melodic/geneticsolver:unknown $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH - docker tag $LOCAL_REPO/melodic/geneticsolver:unknown $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/geneticsolver:$CI_COMMIT_BRANCH
#deploy:metasolver: deploy:metasolver:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# script: script:
# - $DOCKER_CLI $METASOLVER_CLI -Ddocker.imagePrefix=melodic/ clean install - $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 - 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 - docker tag $LOCAL_REPO/melodic/metasolver:unknown $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH
# - docker push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH
#
#deploy:mq-adapter: deploy:mq-adapter:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
# services: services:
# - $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
# script: script:
# - $DOCKER_CLI $MQ_ADAPTER_CLI -Ddocker.imagePrefix=melodic/ clean install - $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 - 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 - docker tag $LOCAL_REPO/melodic/mq-http-adapter:unknown $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH
# - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH
deploy:nc-solver: deploy:nc-solver:
stage: deploy stage: deploy
...@@ -756,33 +756,33 @@ deploy:mcts-solver: ...@@ -756,33 +756,33 @@ deploy:mcts-solver:
- echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
- docker tag $LOCAL_REPO/melodic/mctssolver:unknown $CI_REGISTRY_IMAGE/mctssolver:$CI_COMMIT_BRANCH - docker tag $LOCAL_REPO/melodic/mctssolver:unknown $CI_REGISTRY_IMAGE/mctssolver:$CI_COMMIT_BRANCH
- docker push $CI_REGISTRY_IMAGE/mctssolver:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/mctssolver:$CI_COMMIT_BRANCH
#
#deploy:gui-backend: deploy:gui-backend:
# stage: deploy stage: deploy
# only: only:
# - master - master
# - rc3.0 - rc3.0
# - rc3.1 - rc3.1
# image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE