From 564d1ddf320f8cb1e8961d1bef740a1237f5cd91 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 10:21:51 +0100 Subject: [PATCH 01/36] add gitlab-ci.yml for metamodel and jwt-commons --- .gitlab-ci.yml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..6b5f4175b --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,71 @@ +variables: + DOCKER_PUSH: "false" + DOCKER_REPO: "172.31.1.100:5000" + MAVEN_IMAGE: "maven:3.5.2-jdk-8" + DOCKER_DIND_IMAGE: "docker:19.03.1" + DOCKER_DIND_SERVICE: "$DOCKER_DIND_IMAGE-dind" + DOCKER_DRIVER: overlay + DOCKER_TLS_CERTDIR: "/certs" + + MAVEN_OPTS: "-Xmx2048m -Xms2048m" + SKIP_TESTS: "true" + + DOCKER_CLI: "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $CI_PROJECT_DIR/maven_repo:/root/.m2 -w /usr/src/mymaven -v $CI_PROJECT_DIR:/usr/src/mymaven --env-file .env.list $MAVEN_IMAGE" + MELODIC_UPPERWARE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f pom.xml" + UPPERWARE_METAMODEL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f upperware_metamodel/pom.xml" + JWT_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f jwt-commons/pom.xml" +cache: + paths: + - maven_repo/ + +before_script: + - mkdir -p $HOME/.m2 + - echo ' + '$CI_PROJECT_DIR'/maven_repo + ' > $HOME/.m2/settings.xml + - echo "MAVEN_OPTS=$MAVEN_OPTS" > $CI_PROJECT_DIR/.env.list + +build:melodic-upperware: + stage: build + image: $MAVEN_IMAGE + script: + - $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install + +build:upperware-metamodel: + stage: build + image: $MAVEN_IMAGE + script: + - $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install + +build:jwt-commons: + stage: build + image: $MAVEN_IMAGE + script: + - $JWT_COMMONS_CLI -Pwithout-docker clean install + +deploy:melodic-upperware: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy + +deploy:upperware-metamodel: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy + +deploy:upperware-metamodel: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $JWT_COMMONS_CLI deploy -- GitLab From b77f70a82d6258041c7113beb96d1da7a5ebaa14 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 10:46:19 +0100 Subject: [PATCH 02/36] add build deploy configuration for cache and dlms --- .gitlab-ci.yml | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b5f4175b..914733603 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,9 @@ variables: MELODIC_UPPERWARE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f pom.xml" UPPERWARE_METAMODEL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f upperware_metamodel/pom.xml" JWT_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f jwt-commons/pom.xml" + MELODIC_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-commons/pom.xml" + MELODIC_CACHE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-cache/pom.xml" + DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -Ddocker.imagePrefix=melodic-$CI_COMMIT_BRANCH/ -f dlms/pom.xml" cache: paths: - maven_repo/ @@ -28,6 +31,11 @@ before_script: ' > $HOME/.m2/settings.xml - echo "MAVEN_OPTS=$MAVEN_OPTS" > $CI_PROJECT_DIR/.env.list +after_script: + - echo '==========================================================================' + - docker image ls + - echo '==========================================================================' + build:melodic-upperware: stage: build image: $MAVEN_IMAGE @@ -46,6 +54,24 @@ build:jwt-commons: script: - $JWT_COMMONS_CLI -Pwithout-docker clean install +build:melodic-commons: + stage: build + image: $MAVEN_IMAGE + script: + - $MELODIC_COMMONS_CLI -Pwithout-docker clean install + +build:melodic-cache: + stage: build + image: $MAVEN_IMAGE + script: + - $MELODIC_CACHE_CLI -Pwithout-docker clean install + +build:dlms: + stage: build + image: $MAVEN_IMAGE + script: + - $DLMS_CLI -Pwithout-docker clean install + deploy:melodic-upperware: stage: deploy image: $DOCKER_DIND_IMAGE @@ -62,10 +88,26 @@ deploy:upperware-metamodel: script: - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy -deploy:upperware-metamodel: +deploy:jwt-commons: stage: deploy image: $DOCKER_DIND_IMAGE services: - $DOCKER_DIND_SERVICE script: - $DOCKER_CLI $JWT_COMMONS_CLI deploy + +deploy:melodic-commons: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy + +deploy:melodic-cache: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $MELODIC_CACHE_CLI deploy -- GitLab From 4e2400cf3292d6bfe73a89f6239bab2fa95ace9f Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 11:29:27 +0100 Subject: [PATCH 03/36] gitlab-ci configuration for jwt-server --- .gitlab-ci.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 914733603..47a6c2b02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ variables: DOCKER_PUSH: "false" - DOCKER_REPO: "172.31.1.100:5000" + LOCAL_REPO: "127.0.0.1:5000" + DOCKER_REPO: "gitlab.ow2.org:4567" MAVEN_IMAGE: "maven:3.5.2-jdk-8" DOCKER_DIND_IMAGE: "docker:19.03.1" DOCKER_DIND_SERVICE: "$DOCKER_DIND_IMAGE-dind" @@ -16,7 +17,9 @@ variables: JWT_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f jwt-commons/pom.xml" MELODIC_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-commons/pom.xml" MELODIC_CACHE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-cache/pom.xml" - DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -Ddocker.imagePrefix=melodic-$CI_COMMIT_BRANCH/ -f dlms/pom.xml" + DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f dlms/pom.xml" + PENALTY_CALCULATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f penalty-calculator/pom.xml" + JWT_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f jwt-server/pom.xml" cache: paths: - maven_repo/ @@ -72,6 +75,18 @@ build:dlms: script: - $DLMS_CLI -Pwithout-docker clean install +build:penalty-calculator: + stage: build + image: $MAVEN_IMAGE + script: + - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install + +build:jwt-server: + stage: build + image: $MAVEN_IMAGE + script: + - $JWT_SERVER_CLI -Pwithout-docker clean install + deploy:melodic-upperware: stage: deploy image: $DOCKER_DIND_IMAGE @@ -111,3 +126,15 @@ deploy:melodic-cache: - $DOCKER_DIND_SERVICE script: - $DOCKER_CLI $MELODIC_CACHE_CLI deploy + +deploy:jwt-server: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $JWT_SERVER_CLI deploy + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker tag $LOCAL_REPO/melodic/jwt-server $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH + - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH + -- GitLab From 33a6ed4aacbf6044e38cd892f91009ab7f00b2a4 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 12:31:15 +0100 Subject: [PATCH 04/36] fixed local location of jwtserver docker image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47a6c2b02..889c444ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,6 +135,6 @@ deploy:jwt-server: script: - $DOCKER_CLI $JWT_SERVER_CLI deploy - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker tag $LOCAL_REPO/melodic/jwt-server $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH + - docker tag $LOCAL_REPO/melodic-unknown/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH -- GitLab From ec0dbc6e4f6024941588b8feeb26e92035e22217 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 13:25:23 +0100 Subject: [PATCH 05/36] deploy config for jwt-server --- .gitlab-ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 889c444ed..b3857634b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,12 +81,6 @@ build:penalty-calculator: script: - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install -build:jwt-server: - stage: build - image: $MAVEN_IMAGE - script: - - $JWT_SERVER_CLI -Pwithout-docker clean install - deploy:melodic-upperware: stage: deploy image: $DOCKER_DIND_IMAGE @@ -133,8 +127,8 @@ deploy:jwt-server: services: - $DOCKER_DIND_SERVICE script: - - $DOCKER_CLI $JWT_SERVER_CLI deploy + - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker tag $LOCAL_REPO/melodic-unknown/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH + - docker tag $LOCAL_REPO/melodic/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH -- GitLab From 4192952f23c5e82351ef282a77e22ef06b3374f1 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 13:56:53 +0100 Subject: [PATCH 06/36] fix prefix for docker image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3857634b..5e8c9bf8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ deploy:jwt-server: services: - $DOCKER_DIND_SERVICE script: - - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install + - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=/melodic/ clean install - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker tag $LOCAL_REPO/melodic/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH -- GitLab From 35e5319b89a68de1176afceaab7cd2cb8e1400fd Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 15:29:21 +0100 Subject: [PATCH 07/36] omit jwt-server push from pom.xml configuration --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e8c9bf8f..685788612 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: MELODIC_CACHE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-cache/pom.xml" DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f dlms/pom.xml" PENALTY_CALCULATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f penalty-calculator/pom.xml" - JWT_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f jwt-server/pom.xml" + JWT_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f jwt-server/pom.xml" cache: paths: - maven_repo/ -- GitLab From eea170b16417b351d869699bf9025da438050a13 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 16:02:31 +0100 Subject: [PATCH 08/36] fix docker image prefix for jwt-server --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 685788612..f924e56a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ deploy:jwt-server: services: - $DOCKER_DIND_SERVICE script: - - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=/melodic/ clean install + - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker tag $LOCAL_REPO/melodic/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH -- GitLab From ab886ee427c9b9815506066aa8aed4493214c63d Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 19:05:27 +0100 Subject: [PATCH 09/36] improve login to docker registry --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f924e56a6..ca1ccbcb2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,7 +128,7 @@ deploy:jwt-server: - $DOCKER_DIND_SERVICE script: - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin - docker tag $LOCAL_REPO/melodic/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH -- GitLab From 40b0e40f5437576190e4f6954b613660b2c97862 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 19:33:35 +0100 Subject: [PATCH 10/36] fixed address to container registry --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca1ccbcb2..80b917f18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,7 @@ before_script: '$CI_PROJECT_DIR'/maven_repo ' > $HOME/.m2/settings.xml - echo "MAVEN_OPTS=$MAVEN_OPTS" > $CI_PROJECT_DIR/.env.list + - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin after_script: - echo '==========================================================================' @@ -128,7 +129,6 @@ deploy:jwt-server: - $DOCKER_DIND_SERVICE script: - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin - - docker tag $LOCAL_REPO/melodic/jwtserver $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH - - docker push $DOCKER_REPO/melodic/upperware/jwt-server:$CI_COMMIT_BRANCH + - docker tag $LOCAL_REPO/melodic/jwtserver $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH -- GitLab From 8930b9db8b7b8dc68e594fcc8e1ad35d101ba3a1 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 20:04:54 +0100 Subject: [PATCH 11/36] fix docker run command --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80b917f18..f1a2d4905 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ before_script: '$CI_PROJECT_DIR'/maven_repo ' > $HOME/.m2/settings.xml - echo "MAVEN_OPTS=$MAVEN_OPTS" > $CI_PROJECT_DIR/.env.list - - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin + - echo "$K8S_SECRET_DOCKER_PASSWORD" | $DOCKER_CLI login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin after_script: - echo '==========================================================================' @@ -127,8 +127,8 @@ deploy:jwt-server: image: $DOCKER_DIND_IMAGE services: - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install + script: + - docker $JWT_SERVER_CLI -Ddocker.imagePrefix=melodic/ clean install - docker tag $LOCAL_REPO/melodic/jwtserver $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH -- GitLab From fbaabd2592db66ef2c1b02eb4c657ea99827ccb6 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 18 Mar 2020 20:10:59 +0100 Subject: [PATCH 12/36] fixed docker not found error --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1a2d4905..a9cb3dbf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,6 @@ before_script: '$CI_PROJECT_DIR'/maven_repo ' > $HOME/.m2/settings.xml - echo "MAVEN_OPTS=$MAVEN_OPTS" > $CI_PROJECT_DIR/.env.list - - echo "$K8S_SECRET_DOCKER_PASSWORD" | $DOCKER_CLI login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin after_script: - echo '==========================================================================' @@ -128,7 +127,8 @@ deploy:jwt-server: services: - $DOCKER_DIND_SERVICE script: - - docker $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 - docker tag $LOCAL_REPO/melodic/jwtserver $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH -- GitLab From f9813f593a1973316005a19f9ad19194affc8ef1 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 19 Mar 2020 08:52:28 +0100 Subject: [PATCH 13/36] build/push config for dlms --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9cb3dbf1..0c21f2eda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,9 +17,12 @@ variables: JWT_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f jwt-commons/pom.xml" MELODIC_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-commons/pom.xml" MELODIC_CACHE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-cache/pom.xml" - DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f dlms/pom.xml" + DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/pom.xml" + DLMS_UTILITY_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/DLMSUtility/pom.xml" + DLMS_CONTROLLER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/DLMSController/pom.xml" + DLMS_WEB_SERVICE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/DLMSWebService/pom.xml" PENALTY_CALCULATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -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" + JWT_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f jwt-server/pom.xml" cache: paths: - maven_repo/ @@ -121,6 +124,36 @@ deploy:melodic-cache: script: - $DOCKER_CLI $MELODIC_CACHE_CLI deploy +deploy:dlms-utility: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $DLMS_UTILITY_CLI deploy + +deploy:dlms-controller: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH + +deploy:dlms-webservice: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH + deploy:jwt-server: stage: deploy image: $DOCKER_DIND_IMAGE -- GitLab From 1f8fe939399504e228f15ba7194d5a865e25daec Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 19 Mar 2020 09:51:15 +0100 Subject: [PATCH 14/36] fix jwt-server push, add docker image push for adapter, generator, cpsolver, dlmsagent --- .gitlab-ci.yml | 91 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c21f2eda..be211dec5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,12 +17,17 @@ variables: JWT_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f jwt-commons/pom.xml" MELODIC_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-commons/pom.xml" MELODIC_CACHE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-cache/pom.xml" - DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/pom.xml" - DLMS_UTILITY_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/DLMSUtility/pom.xml" - DLMS_CONTROLLER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/DLMSController/pom.xml" - DLMS_WEB_SERVICE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f dlms/DLMSWebService/pom.xml" - PENALTY_CALCULATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.repository=$LOCAL_REPO -Ddocker.push=true -f penalty-calculator/pom.xml" - JWT_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=true -f jwt-server/pom.xml" + DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f dlms/pom.xml" + DLMS_UTILITY_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f dlms/DLMSUtility/pom.xml" + DLMS_CONTROLLER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f dlms/DLMSController/pom.xml" + DLMS_WEB_SERVICE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f dlms/DLMSWebService/pom.xml" + 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" + 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_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp-solver/pom.xml" + DLMS_AGENT_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f dlmsAgent/pom.xml" cache: paths: - maven_repo/ @@ -84,6 +89,18 @@ build:penalty-calculator: script: - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install +build:utility-generator: + stage: build + image: $MAVEN_IMAGE + script: + - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install + +build:dlms-agent: + stage: build + image: $MAVEN_IMAGE + script: + - $DLMS_AGENT_CLI -Pwithout-docker clean install + deploy:melodic-upperware: stage: deploy image: $DOCKER_DIND_IMAGE @@ -154,6 +171,14 @@ deploy:dlms-webservice: - docker tag $LOCAL_REPO/melodic/dlms-webservice $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH +deploy:penalty-calculator: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy + deploy:jwt-server: stage: deploy image: $DOCKER_DIND_IMAGE @@ -165,3 +190,57 @@ deploy:jwt-server: - docker tag $LOCAL_REPO/melodic/jwtserver $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH +deploy:utility-generator: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy + +deploy:adapter: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH + +deploy:cp-generator: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH + +deploy:cp-solver: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH + +deploy:dlms-agent: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $DLMS_AGENT_CLI deploy + after_script: + - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER + - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD + - export AWS_DEFAULT_REGION=eu-west-1 + - ls -l dlmsAgent/target + - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ -- GitLab From 086df7c12d00375dbf0205b764d11baebc9a125e Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 19 Mar 2020 11:01:05 +0100 Subject: [PATCH 15/36] add build stage for dlms utility --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be211dec5..877cc6cd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,6 +83,12 @@ build:dlms: script: - $DLMS_CLI -Pwithout-docker clean install +build:dlms-utility: + stage: build + image: $MAVEN_IMAGE + script: + - $DLMS_UTILITY_CLI -Pwithout-docker clean install + build:penalty-calculator: stage: build image: $MAVEN_IMAGE -- GitLab From accf329f6f6b70ce1f64da410ec9db3116095137 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 19 Mar 2020 12:08:10 +0100 Subject: [PATCH 16/36] add deploy for the whole dlms --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 877cc6cd1..1f6514782 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,6 +147,14 @@ deploy:melodic-cache: script: - $DOCKER_CLI $MELODIC_CACHE_CLI deploy +deploy:dlms: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $DLMS_CLI deploy + deploy:dlms-utility: stage: deploy image: $DOCKER_DIND_IMAGE -- GitLab From 9747bd7674c3722ce8cd7af946ccbbc2c2474883 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 19 Mar 2020 17:02:41 +0100 Subject: [PATCH 17/36] add docker push config for ems, metasolver, mq-adapter, gui-backend, improve dlms-agent push to S3 --- .gitlab-ci.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f6514782..0a0b8d3f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,10 @@ variables: CP_GENERATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp_generator/pom.xml" CP_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp-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" + 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" cache: paths: - maven_repo/ @@ -253,6 +257,60 @@ deploy:dlms-agent: script: - $DOCKER_CLI $DLMS_AGENT_CLI deploy after_script: + - deploy_dlms_agent_to_s3 + +deploy:ems: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_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 $CI_REGISTRY_IMAGE/ems:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/ems:$CI_COMMIT_BRANCH + +deploy:metasolver: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH + +deploy:mq-adapter: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + 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-adapter $CI_REGISTRY_IMAGE/mq-adapter:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/mq-adapter:$CI_COMMIT_BRANCH + +deploy:gui-backend: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + 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 $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH + +deploy_dlms_agent_to_s3: + image: "python:latest" + stage: deploy + dependencies: + - deploy:dlms-agent + before_script: + - pip install awscli + script: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD - export AWS_DEFAULT_REGION=eu-west-1 -- GitLab From ab02eb3b4572b85483b24eac0ab773d79c8b6e38 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 19 Mar 2020 17:09:32 +0100 Subject: [PATCH 18/36] fix problem with dependencies in dlms push to s3 bucket --- .gitlab-ci.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a0b8d3f3..c18cee7f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,6 +259,18 @@ deploy:dlms-agent: after_script: - deploy_dlms_agent_to_s3 +deploy_dlms_agent_to_s3: + image: "python:latest" + stage: deploy + before_script: + - pip install awscli + script: + - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER + - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD + - export AWS_DEFAULT_REGION=eu-west-1 + - ls -l dlmsAgent/target + - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ + deploy:ems: stage: deploy image: $DOCKER_DIND_IMAGE @@ -302,17 +314,3 @@ deploy:gui-backend: - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin - docker tag $LOCAL_REPO/melodic/gui-backend $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH - -deploy_dlms_agent_to_s3: - image: "python:latest" - stage: deploy - dependencies: - - deploy:dlms-agent - before_script: - - pip install awscli - script: - - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD - - export AWS_DEFAULT_REGION=eu-west-1 - - ls -l dlmsAgent/target - - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ -- GitLab From 86c2dbf45160c208be00677da37de7ee42e52085 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Mon, 23 Mar 2020 12:05:20 +0100 Subject: [PATCH 19/36] added missing build deploy sections for ems --- .gitlab-ci.yml | 132 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c18cee7f7..9f7f22a72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,10 +17,12 @@ variables: JWT_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f jwt-commons/pom.xml" MELODIC_COMMONS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-commons/pom.xml" MELODIC_CACHE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f melodic-cache/pom.xml" + DLMS_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f dlms/pom.xml" DLMS_UTILITY_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -f dlms/DLMSUtility/pom.xml" DLMS_CONTROLLER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f dlms/DLMSController/pom.xml" DLMS_WEB_SERVICE_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f dlms/DLMSWebService/pom.xml" + 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" @@ -28,7 +30,17 @@ variables: CP_GENERATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp_generator/pom.xml" CP_SOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f cp-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" + EMS_UTIL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/util/pom.xml" + EMS_BROKER_CLIENT_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/broker-client/pom.xml" + EMS_BROKER_CEP_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/broker-cep/pom.xml" + EMS_BAGUETTE_CLIENT_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/baguette-client/pom.xml" + EMS_BAGUETTE_CLIENT_INSTALL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/baguette-client-install/pom.xml" + EMS_BAGUETTE_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/baguette-server/pom.xml" + EMS_TRANSLATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/translator/pom.xml" + EMS_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/control-service/pom.xml" + 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" @@ -111,6 +123,54 @@ build:dlms-agent: script: - $DLMS_AGENT_CLI -Pwithout-docker clean install +build:ems: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_CLI -Pwithout-docker clean install + +build:ems-util: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_UTIL_CLI -Pwithout-docker clean install + +build:ems-broker-client: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install + +build:ems-broker-cep: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install + +build:ems-baguette-client: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install + +build:ems-baguette-client-install: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install + +build:ems-baguette-server: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install + +build:ems-translator: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install + deploy:melodic-upperware: stage: deploy image: $DOCKER_DIND_IMAGE @@ -268,19 +328,83 @@ deploy_dlms_agent_to_s3: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD - export AWS_DEFAULT_REGION=eu-west-1 - - ls -l dlmsAgent/target + - ls -l - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ deploy:ems: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $EMS_CLI $DLMS_CLI deploy + +deploy:ems-util: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_UTIL_CLI deploy + +deploy:ems-broker-client: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy + +deploy:ems-broker-cep: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy + +deploy:ems-baguette-client: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy + +deploy:ems-baguette-client-install: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy + +deploy:ems-baguette-server: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy + +deploy:ems-translator: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + script: + - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy + +deploy:ems-server: stage: deploy image: $DOCKER_DIND_IMAGE services: - $DOCKER_DIND_SERVICE script: - - $DOCKER_CLI $EMS_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 - - docker tag $LOCAL_REPO/melodic/ems $CI_REGISTRY_IMAGE/ems:$CI_COMMIT_BRANCH - - docker push $CI_REGISTRY_IMAGE/ems:$CI_COMMIT_BRANCH + - docker tag $LOCAL_REPO/melodic/ems-server $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH deploy:metasolver: stage: deploy -- GitLab From 160c17f4b19cd1dce3ce84187f41d9e0ba1974d9 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Mon, 23 Mar 2020 12:27:11 +0100 Subject: [PATCH 20/36] put ems-baguette-server before ems-baguette-client-install --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f7f22a72..52eab937d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,17 +153,17 @@ build:ems-baguette-client: script: - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install -build:ems-baguette-client-install: +build:ems-baguette-server: stage: build image: $MAVEN_IMAGE script: - - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install + - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install -build:ems-baguette-server: +build:ems-baguette-client-install: stage: build image: $MAVEN_IMAGE script: - - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install + - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install build:ems-translator: stage: build -- GitLab From 8716a6bb45ffc3ed9c5362046ab18eb3a5f4670b Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Mon, 23 Mar 2020 15:44:14 +0100 Subject: [PATCH 21/36] fix bug in ems deploy section --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52eab937d..ace2e3251 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -337,7 +337,7 @@ deploy:ems: services: - $DOCKER_DIND_SERVICE script: - - $EMS_CLI $DLMS_CLI deploy + - $DOCKER_CLI $EMS_CLI deploy deploy:ems-util: stage: deploy -- GitLab From d6878a00224ab5e3b3643e9a5c588d430e1f93e0 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 24 Mar 2020 08:52:11 +0100 Subject: [PATCH 22/36] fix bug with ems and mq-http-adapter --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ace2e3251..b075462ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -328,7 +328,8 @@ deploy_dlms_agent_to_s3: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD - export AWS_DEFAULT_REGION=eu-west-1 - - ls -l + - ls -l dlmsAgent + - ls -l dlmsAgent/target - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ deploy:ems: @@ -371,21 +372,21 @@ deploy:ems-baguette-client: script: - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy -deploy:ems-baguette-client-install: +deploy:ems-baguette-server: stage: deploy image: $DOCKER_DIND_IMAGE services: - $DOCKER_DIND_SERVICE script: - - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy + - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy -deploy:ems-baguette-server: +deploy:ems-baguette-client-install: stage: deploy image: $DOCKER_DIND_IMAGE services: - $DOCKER_DIND_SERVICE script: - - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy + - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy deploy:ems-translator: stage: deploy @@ -425,8 +426,8 @@ deploy:mq-adapter: 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-adapter $CI_REGISTRY_IMAGE/mq-adapter:$CI_COMMIT_BRANCH - - docker push $CI_REGISTRY_IMAGE/mq-adapter:$CI_COMMIT_BRANCH + - docker tag $LOCAL_REPO/melodic/mq-http-adapter $CI_REGISTRY_IMAGE/melodic/mq-http-adapter:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/melodic/mq-http-adapter:$CI_COMMIT_BRANCH deploy:gui-backend: stage: deploy -- GitLab From 4a4271695ef8b9d93d2f6cc24d2c025ca025b46a Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 24 Mar 2020 13:29:34 +0100 Subject: [PATCH 23/36] fix for missing target of dlmsAgent --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b075462ba..95c6aab0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -316,12 +316,12 @@ deploy:dlms-agent: - $DOCKER_DIND_SERVICE script: - $DOCKER_CLI $DLMS_AGENT_CLI deploy - after_script: - - deploy_dlms_agent_to_s3 -deploy_dlms_agent_to_s3: +deploy:deploy-dlms-agent-to-s3: image: "python:latest" stage: deploy + dependencies: + - deploy:dlms-agent before_script: - pip install awscli script: -- GitLab From 26a34a4305d7d05391743bc5881e082eb1ea23d8 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 24 Mar 2020 13:32:58 +0100 Subject: [PATCH 24/36] fix for dlms agent deploy to s3 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95c6aab0b..d8561892d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -320,8 +320,6 @@ deploy:dlms-agent: deploy:deploy-dlms-agent-to-s3: image: "python:latest" stage: deploy - dependencies: - - deploy:dlms-agent before_script: - pip install awscli script: @@ -331,6 +329,8 @@ deploy:deploy-dlms-agent-to-s3: - ls -l dlmsAgent - ls -l dlmsAgent/target - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ + dependencies: + - deploy:dlms-agent deploy:ems: stage: deploy -- GitLab From ae7c9c37916daf710328bdfd2c68c37909c65526 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 24 Mar 2020 13:42:06 +0100 Subject: [PATCH 25/36] fix dependency in dlms-agent deploy --- .gitlab-ci.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8561892d..36a96d242 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -309,14 +309,6 @@ deploy:cp-solver: - docker tag $LOCAL_REPO/melodic/cpsolver $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH -deploy:dlms-agent: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $DLMS_AGENT_CLI deploy - deploy:deploy-dlms-agent-to-s3: image: "python:latest" stage: deploy @@ -330,7 +322,7 @@ deploy:deploy-dlms-agent-to-s3: - ls -l dlmsAgent/target - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ dependencies: - - deploy:dlms-agent + - build:dlms-agent deploy:ems: stage: deploy -- GitLab From 32079435bc1d779d1ee603e05484becfb79c0fff Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 24 Mar 2020 20:08:24 +0100 Subject: [PATCH 26/36] change name for dlms-agent deploy stage --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36a96d242..cd038a8f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -309,9 +309,9 @@ deploy:cp-solver: - docker tag $LOCAL_REPO/melodic/cpsolver $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH - docker push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH -deploy:deploy-dlms-agent-to-s3: - image: "python:latest" +deploy:dlms-agent: stage: deploy + image: "python:latest" before_script: - pip install awscli script: @@ -321,8 +321,6 @@ deploy:deploy-dlms-agent-to-s3: - ls -l dlmsAgent - ls -l dlmsAgent/target - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ - dependencies: - - build:dlms-agent deploy:ems: stage: deploy -- GitLab From 40bcb323ca996cd0a8ba80d6d216aa13aa9aa03e Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 25 Mar 2020 16:53:21 +0100 Subject: [PATCH 27/36] fix name for mq-http-adapter image --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd038a8f0..814004d93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -416,8 +416,8 @@ deploy:mq-adapter: 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 $CI_REGISTRY_IMAGE/melodic/mq-http-adapter:$CI_COMMIT_BRANCH - - docker push $CI_REGISTRY_IMAGE/melodic/mq-http-adapter:$CI_COMMIT_BRANCH + - docker tag $LOCAL_REPO/melodic/mq-http-adapter $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH deploy:gui-backend: stage: deploy -- GitLab From 2e9d0e24ac490bcc0b5607f9917221bfb0ae3c1e Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 31 Mar 2020 16:07:07 +0200 Subject: [PATCH 28/36] tmp stash and fix for dlmsagent --- .gitlab-ci.yml | 698 ++++++++++++++++++++++++------------------------- 1 file changed, 349 insertions(+), 349 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 814004d93..d4723e753 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,59 +63,59 @@ after_script: - docker image ls - echo '==========================================================================' -build:melodic-upperware: - stage: build - image: $MAVEN_IMAGE - script: - - $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install - -build:upperware-metamodel: - stage: build - image: $MAVEN_IMAGE - script: - - $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install - -build:jwt-commons: - stage: build - image: $MAVEN_IMAGE - script: - - $JWT_COMMONS_CLI -Pwithout-docker clean install - -build:melodic-commons: - stage: build - image: $MAVEN_IMAGE - script: - - $MELODIC_COMMONS_CLI -Pwithout-docker clean install - -build:melodic-cache: - stage: build - image: $MAVEN_IMAGE - script: - - $MELODIC_CACHE_CLI -Pwithout-docker clean install - -build:dlms: - stage: build - image: $MAVEN_IMAGE - script: - - $DLMS_CLI -Pwithout-docker clean install - -build:dlms-utility: - stage: build - image: $MAVEN_IMAGE - script: - - $DLMS_UTILITY_CLI -Pwithout-docker clean install - -build:penalty-calculator: - stage: build - image: $MAVEN_IMAGE - script: - - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install - -build:utility-generator: - stage: build - image: $MAVEN_IMAGE - script: - - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install +# build:melodic-upperware: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install + +# build:upperware-metamodel: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install + +# build:jwt-commons: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $JWT_COMMONS_CLI -Pwithout-docker clean install + +# build:melodic-commons: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $MELODIC_COMMONS_CLI -Pwithout-docker clean install + +# build:melodic-cache: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $MELODIC_CACHE_CLI -Pwithout-docker clean install + +# build:dlms: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $DLMS_CLI -Pwithout-docker clean install + +# build:dlms-utility: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $DLMS_UTILITY_CLI -Pwithout-docker clean install + +# build:penalty-calculator: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install + +# build:utility-generator: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install build:dlms-agent: stage: build @@ -123,191 +123,191 @@ build:dlms-agent: script: - $DLMS_AGENT_CLI -Pwithout-docker clean install -build:ems: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_CLI -Pwithout-docker clean install - -build:ems-util: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_UTIL_CLI -Pwithout-docker clean install - -build:ems-broker-client: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install - -build:ems-broker-cep: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install - -build:ems-baguette-client: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install - -build:ems-baguette-server: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install - -build:ems-baguette-client-install: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install - -build:ems-translator: - stage: build - image: $MAVEN_IMAGE - script: - - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install - -deploy:melodic-upperware: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy - -deploy:upperware-metamodel: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy - -deploy:jwt-commons: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $JWT_COMMONS_CLI deploy - -deploy:melodic-commons: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy - -deploy:melodic-cache: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $MELODIC_CACHE_CLI deploy - -deploy:dlms: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $DLMS_CLI deploy - -deploy:dlms-utility: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $DLMS_UTILITY_CLI deploy - -deploy:dlms-controller: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH - -deploy:dlms-webservice: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH - -deploy:penalty-calculator: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy - -deploy:jwt-server: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH - -deploy:utility-generator: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy - -deploy:adapter: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH - -deploy:cp-generator: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH - -deploy:cp-solver: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH +# build:ems: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_CLI -Pwithout-docker clean install + +# build:ems-util: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_UTIL_CLI -Pwithout-docker clean install + +# build:ems-broker-client: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install + +# build:ems-broker-cep: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install + +# build:ems-baguette-client: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install + +# build:ems-baguette-server: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install + +# build:ems-baguette-client-install: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install + +# build:ems-translator: +# stage: build +# image: $MAVEN_IMAGE +# script: +# - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install + +# deploy:melodic-upperware: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy + +# deploy:upperware-metamodel: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy + +# deploy:jwt-commons: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $JWT_COMMONS_CLI deploy + +# deploy:melodic-commons: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy + +# deploy:melodic-cache: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $MELODIC_CACHE_CLI deploy + +# deploy:dlms: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $DLMS_CLI deploy + +# deploy:dlms-utility: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $DLMS_UTILITY_CLI deploy + +# deploy:dlms-controller: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH + +# deploy:dlms-webservice: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH + +# deploy:penalty-calculator: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy + +# deploy:jwt-server: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH + +# deploy:utility-generator: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy + +# deploy:adapter: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH + +# deploy:cp-generator: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH + +# deploy:cp-solver: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH deploy:dlms-agent: stage: deploy @@ -318,114 +318,114 @@ deploy:dlms-agent: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD - export AWS_DEFAULT_REGION=eu-west-1 - - ls -l dlmsAgent - - ls -l dlmsAgent/target - - aws s3 cp dlmsAgent/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ - -deploy:ems: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_CLI deploy - -deploy:ems-util: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_UTIL_CLI deploy - -deploy:ems-broker-client: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy - -deploy:ems-broker-cep: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy - -deploy:ems-baguette-client: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy - -deploy:ems-baguette-server: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy - -deploy:ems-baguette-client-install: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy - -deploy:ems-translator: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - script: - - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy - -deploy:ems-server: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH - -deploy:metasolver: - stage: deploy - 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 push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH - -deploy:mq-adapter: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - 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 $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH - - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH - -deploy:gui-backend: - stage: deploy - image: $DOCKER_DIND_IMAGE - services: - - $DOCKER_DIND_SERVICE - 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 $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH - - docker push $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH + - ls -l $CI_PROJECT_DIR + - ls -l $CI_PROJECT_DIR/target + - aws s3 cp $CI_PROJECT_DIR/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ + +# deploy:ems: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_CLI deploy + +# deploy:ems-util: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_UTIL_CLI deploy + +# deploy:ems-broker-client: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy + +# deploy:ems-broker-cep: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy + +# deploy:ems-baguette-client: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy + +# deploy:ems-baguette-server: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy + +# deploy:ems-baguette-client-install: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy + +# deploy:ems-translator: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# script: +# - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy + +# deploy:ems-server: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH + +# deploy:metasolver: +# stage: deploy +# 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 push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH + +# deploy:mq-adapter: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# 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 $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH +# - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH + +# deploy:gui-backend: +# stage: deploy +# image: $DOCKER_DIND_IMAGE +# services: +# - $DOCKER_DIND_SERVICE +# 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 $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH +# - docker push $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH -- GitLab From c87f80d333d9c136758ba349bfedc1d0deedc2a2 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Tue, 31 Mar 2020 16:20:05 +0200 Subject: [PATCH 29/36] fix path to dlmsAgent --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4723e753..018351b14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,9 +318,9 @@ deploy:dlms-agent: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD - export AWS_DEFAULT_REGION=eu-west-1 - - ls -l $CI_PROJECT_DIR - - ls -l $CI_PROJECT_DIR/target - - aws s3 cp $CI_PROJECT_DIR/target/DLMSAgent-3.0.0-SNAPSHOT.jar s3://melodic.testing.data/ARTIFACTS/ow2/dlmsagent/ + - 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/ # deploy:ems: # stage: deploy -- GitLab From 55442addb8207a5eec6d30fd02a503d72a9dba87 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 1 Apr 2020 09:58:51 +0200 Subject: [PATCH 30/36] pass dependencies between stages for dlms-agent --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 018351b14..f442a9ca0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,6 +122,8 @@ build:dlms-agent: image: $MAVEN_IMAGE script: - $DLMS_AGENT_CLI -Pwithout-docker clean install + artifacts: + untracked: true # build:ems: # stage: build @@ -314,6 +316,8 @@ deploy:dlms-agent: image: "python:latest" before_script: - pip install awscli + dependencies: + - build script: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD -- GitLab From 75117f5d04faeb28c8aac07e2c992ddb45064004 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 1 Apr 2020 10:01:21 +0200 Subject: [PATCH 31/36] fix dependencies --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f442a9ca0..b2ff3909c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -317,7 +317,7 @@ deploy:dlms-agent: before_script: - pip install awscli dependencies: - - build + - build:dlms-agent script: - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_USER - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_PASSWORD -- GitLab From be032a0ea038bcda239f0e1ea7a5c5b43602bcea Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 1 Apr 2020 10:25:07 +0200 Subject: [PATCH 32/36] add artifacts to dlms-agent build configuration --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2ff3909c..bc5630bca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,7 +123,7 @@ build:dlms-agent: script: - $DLMS_AGENT_CLI -Pwithout-docker clean install artifacts: - untracked: true + paths: $CI_PROJECT_DIR/dlmsAgent/target # build:ems: # stage: build -- GitLab From 22ce33e75d8f5bc8aecfe9c1b2d079b1d13a2c41 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Wed, 1 Apr 2020 10:27:50 +0200 Subject: [PATCH 33/36] fix problem with paths in artifacts --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc5630bca..fe132492e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,7 +123,8 @@ build:dlms-agent: script: - $DLMS_AGENT_CLI -Pwithout-docker clean install artifacts: - paths: $CI_PROJECT_DIR/dlmsAgent/target + paths: + - $CI_PROJECT_DIR/dlmsAgent/target # build:ems: # stage: build -- GitLab From 0137daa996e2ece70d6ce1c50b76d7616b298a1f Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 2 Apr 2020 08:33:57 +0200 Subject: [PATCH 34/36] depenedencies for upperware and metamodel --- .gitlab-ci.yml | 63 +++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe132492e..87baead56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,23 +63,32 @@ after_script: - docker image ls - echo '==========================================================================' -# build:melodic-upperware: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install +build:melodic-upperware: + stage: build + image: $MAVEN_IMAGE + script: + - $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/upperware/target -# build:upperware-metamodel: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install +build:upperware-metamodel: + stage: build + image: $MAVEN_IMAGE + script: + - $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/upperware_metamodel/target # build:jwt-commons: # stage: build # image: $MAVEN_IMAGE # script: # - $JWT_COMMONS_CLI -Pwithout-docker clean install +# artifacts: +# paths: +# - $CI_PROJECT_DIR/upperware_metamodel/target # build:melodic-commons: # stage: build @@ -174,27 +183,33 @@ build:dlms-agent: # script: # - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install -# deploy:melodic-upperware: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy +deploy:melodic-upperware: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:melodic-upperware + script: + - $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy -# deploy:upperware-metamodel: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy +deploy:upperware-metamodel: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:upperware-metamodel + script: + - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy # deploy:jwt-commons: # stage: deploy # image: $DOCKER_DIND_IMAGE # services: # - $DOCKER_DIND_SERVICE +# dependencies: +# - build:jwt-commons # script: # - $DOCKER_CLI $JWT_COMMONS_CLI deploy -- GitLab From 54e996aa4c2c5ed477e0ab4e0fb8f0eb0d887625 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Thu, 2 Apr 2020 17:29:39 +0200 Subject: [PATCH 35/36] final gitlabcli file for upperware --- .gitlab-ci.yml | 712 +++++++++++++++++++++++++++---------------------- 1 file changed, 391 insertions(+), 321 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87baead56..dbddb00b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,50 +81,68 @@ build:upperware-metamodel: paths: - $CI_PROJECT_DIR/upperware_metamodel/target -# build:jwt-commons: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $JWT_COMMONS_CLI -Pwithout-docker clean install -# artifacts: -# paths: -# - $CI_PROJECT_DIR/upperware_metamodel/target - -# build:melodic-commons: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $MELODIC_COMMONS_CLI -Pwithout-docker clean install - -# build:melodic-cache: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $MELODIC_CACHE_CLI -Pwithout-docker clean install - -# build:dlms: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $DLMS_CLI -Pwithout-docker clean install - -# build:dlms-utility: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $DLMS_UTILITY_CLI -Pwithout-docker clean install - -# build:penalty-calculator: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install - -# build:utility-generator: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install +build:jwt-commons: + stage: build + image: $MAVEN_IMAGE + script: + - $JWT_COMMONS_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/jwt-commons/target + +build:melodic-commons: + stage: build + image: $MAVEN_IMAGE + script: + - $MELODIC_COMMONS_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/melodic-commons/target + +build:melodic-cache: + stage: build + image: $MAVEN_IMAGE + script: + - $MELODIC_CACHE_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/melodic-cache/target + +build:dlms: + stage: build + image: $MAVEN_IMAGE + script: + - $DLMS_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/dlms/target + +build:dlms-utility: + stage: build + image: $MAVEN_IMAGE + script: + - $DLMS_UTILITY_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/dlms/DLMSUtility/target + +build:penalty-calculator: + stage: build + image: $MAVEN_IMAGE + script: + - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/penalty-calculator/target + +build:utility-generator: + stage: build + image: $MAVEN_IMAGE + script: + - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/utility-generator/target build:dlms-agent: stage: build @@ -135,53 +153,77 @@ build:dlms-agent: paths: - $CI_PROJECT_DIR/dlmsAgent/target -# build:ems: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_CLI -Pwithout-docker clean install - -# build:ems-util: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_UTIL_CLI -Pwithout-docker clean install - -# build:ems-broker-client: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install - -# build:ems-broker-cep: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install - -# build:ems-baguette-client: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install - -# build:ems-baguette-server: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install - -# build:ems-baguette-client-install: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install - -# build:ems-translator: -# stage: build -# image: $MAVEN_IMAGE -# script: -# - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install +build:ems: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/event-management/target + +build:ems-util: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_UTIL_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/event-management/util/target + +build:ems-broker-client: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/event-management/broker-client/target + +build:ems-broker-cep: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/event-management/broker-cep/target + +build:ems-baguette-client: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install + 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: + - $CI_PROJECT_DIR/event-management/baguette-server/target + +build:ems-baguette-client-install: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/event-management/baguette-client-install/target + +build:ems-translator: + stage: build + image: $MAVEN_IMAGE + script: + - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install + artifacts: + paths: + - $CI_PROJECT_DIR/event-management/translator/target deploy:melodic-upperware: stage: deploy @@ -203,129 +245,141 @@ deploy:upperware-metamodel: script: - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy -# deploy:jwt-commons: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# dependencies: -# - build:jwt-commons -# script: -# - $DOCKER_CLI $JWT_COMMONS_CLI deploy - -# deploy:melodic-commons: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy - -# deploy:melodic-cache: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $MELODIC_CACHE_CLI deploy - -# deploy:dlms: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $DLMS_CLI deploy - -# deploy:dlms-utility: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $DLMS_UTILITY_CLI deploy - -# deploy:dlms-controller: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH - -# deploy:dlms-webservice: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH - -# deploy:penalty-calculator: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy - -# deploy:jwt-server: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH - -# deploy:utility-generator: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy - -# deploy:adapter: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH - -# deploy:cp-generator: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH - -# deploy:cp-solver: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH +deploy:jwt-commons: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:jwt-commons + script: + - $DOCKER_CLI $JWT_COMMONS_CLI deploy + +deploy:melodic-commons: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:melodic-commons + script: + - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy + +deploy:melodic-cache: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:melodic-cache + script: + - $DOCKER_CLI $MELODIC_CACHE_CLI deploy + +deploy:dlms: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:dlms + script: + - $DOCKER_CLI $DLMS_CLI deploy + +deploy:dlms-utility: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:dlms-utility + script: + - $DOCKER_CLI $DLMS_UTILITY_CLI deploy + +deploy:dlms-controller: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/dlms-controller:$CI_COMMIT_BRANCH + +deploy:dlms-webservice: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/dlms-webservice:$CI_COMMIT_BRANCH + +deploy:penalty-calculator: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:penalty-calculator + script: + - $DOCKER_CLI $PENALTY_CALCULATOR_CLI deploy + +deploy:jwt-server: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/jwt-server:$CI_COMMIT_BRANCH + +deploy:utility-generator: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:utility-generator + script: + - $DOCKER_CLI $UTILITY_GENERATOR_CLI deploy + +deploy:adapter: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/adapter:$CI_COMMIT_BRANCH + +deploy:cp-generator: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/generator:$CI_COMMIT_BRANCH + +deploy:cp-solver: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/cpsolver:$CI_COMMIT_BRANCH deploy:dlms-agent: stage: deploy @@ -342,110 +396,126 @@ deploy:dlms-agent: - 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/ -# deploy:ems: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_CLI deploy - -# deploy:ems-util: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_UTIL_CLI deploy - -# deploy:ems-broker-client: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy - -# deploy:ems-broker-cep: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy - -# deploy:ems-baguette-client: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy - -# deploy:ems-baguette-server: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy - -# deploy:ems-baguette-client-install: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy - -# deploy:ems-translator: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# script: -# - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy - -# deploy:ems-server: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH - -# deploy:metasolver: -# stage: deploy -# 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 push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH - -# deploy:mq-adapter: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# 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 $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH -# - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH - -# deploy:gui-backend: -# stage: deploy -# image: $DOCKER_DIND_IMAGE -# services: -# - $DOCKER_DIND_SERVICE -# 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 $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH -# - docker push $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH +deploy:ems: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems + script: + - $DOCKER_CLI $EMS_CLI deploy + +deploy:ems-util: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-util + script: + - $DOCKER_CLI $EMS_UTIL_CLI deploy + +deploy:ems-broker-client: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-broker-client + script: + - $DOCKER_CLI $EMS_BROKER_CLIENT_CLI deploy + +deploy:ems-broker-cep: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-broker-cep + script: + - $DOCKER_CLI $EMS_BROKER_CEP_CLI deploy + +deploy:ems-baguette-client: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-baguette-client + script: + - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_CLI deploy + +deploy:ems-baguette-server: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-baguette-server + script: + - $DOCKER_CLI $EMS_BAGUETTE_SERVER_CLI deploy + +deploy:ems-baguette-client-install: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-baguette-client-install + script: + - $DOCKER_CLI $EMS_BAGUETTE_CLIENT_INSTALL_CLI deploy + +deploy:ems-translator: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + dependencies: + - build:ems-translator + script: + - $DOCKER_CLI $EMS_TRANSLATOR_CLI deploy + +deploy:ems-server: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/ems-server:$CI_COMMIT_BRANCH + +deploy:metasolver: + stage: deploy + 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 push $CI_REGISTRY_IMAGE/metasolver:$CI_COMMIT_BRANCH + +deploy:mq-adapter: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + 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 $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/mq-http-adapter:$CI_COMMIT_BRANCH + +deploy:gui-backend: + stage: deploy + image: $DOCKER_DIND_IMAGE + services: + - $DOCKER_DIND_SERVICE + 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 $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH + - docker push $CI_REGISTRY_IMAGE/gui-backend:$CI_COMMIT_BRANCH -- GitLab From 983ecd8eed8377bd731eda7b9a32ffa59c9987b4 Mon Sep 17 00:00:00 2001 From: Alicja Reniewicz Date: Fri, 3 Apr 2020 08:20:05 +0200 Subject: [PATCH 36/36] remove artifacts section for baguette-client (too big) --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dbddb00b0..1fbbecc56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,10 +194,7 @@ build:ems-baguette-client: image: $MAVEN_IMAGE script: - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install - artifacts: - paths: - - $CI_PROJECT_DIR/event-management/baguette-client/target - + build:ems-baguette-server: stage: build image: $MAVEN_IMAGE -- GitLab