Commit 13d207ae authored by Alicja Reniewicz's avatar Alicja Reniewicz
Browse files

Merge branch 'master' into rc3.1

# Conflicts:
#	.gitlab-ci.yml
parents 5a9d5feb 6b78216f
...@@ -82,7 +82,7 @@ build:melodic-upperware: ...@@ -82,7 +82,7 @@ build:melodic-upperware:
script: script:
- $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install - $MELODIC_UPPERWARE_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/upperware/target - $CI_PROJECT_DIR/upperware/target
build:upperware-metamodel: build:upperware-metamodel:
...@@ -91,7 +91,7 @@ build:upperware-metamodel: ...@@ -91,7 +91,7 @@ build:upperware-metamodel:
script: script:
- $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install - $UPPERWARE_METAMODEL_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/upperware_metamodel/target - $CI_PROJECT_DIR/upperware_metamodel/target
build:jwt-commons: build:jwt-commons:
...@@ -109,7 +109,7 @@ build:melodic-commons: ...@@ -109,7 +109,7 @@ build:melodic-commons:
script: script:
- $MELODIC_COMMONS_CLI -Pwithout-docker clean install - $MELODIC_COMMONS_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/melodic-commons/target - $CI_PROJECT_DIR/melodic-commons/target
build:melodic-cache: build:melodic-cache:
...@@ -118,7 +118,7 @@ build:melodic-cache: ...@@ -118,7 +118,7 @@ build:melodic-cache:
script: script:
- $MELODIC_CACHE_CLI -Pwithout-docker clean install - $MELODIC_CACHE_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/melodic-cache/target - $CI_PROJECT_DIR/melodic-cache/target
build:dlms: build:dlms:
...@@ -154,7 +154,7 @@ build:penalty-calculator: ...@@ -154,7 +154,7 @@ build:penalty-calculator:
script: script:
- $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install - $PENALTY_CALCULATOR_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/penalty-calculator/target - $CI_PROJECT_DIR/penalty-calculator/target
build:utility-generator: build:utility-generator:
...@@ -163,7 +163,7 @@ build:utility-generator: ...@@ -163,7 +163,7 @@ build:utility-generator:
script: script:
- $UTILITY_GENERATOR_CLI -Pwithout-docker clean install - $UTILITY_GENERATOR_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/utility-generator/target - $CI_PROJECT_DIR/utility-generator/target
build:cp-solver: build:cp-solver:
...@@ -172,7 +172,7 @@ build:cp-solver: ...@@ -172,7 +172,7 @@ build:cp-solver:
script: script:
- $CP_SOLVER_CLI -Pwithout-docker clean install - $CP_SOLVER_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/cp-solver/target - $CI_PROJECT_DIR/cp-solver/target
build:zpp-solver: build:zpp-solver:
...@@ -181,7 +181,7 @@ build:zpp-solver: ...@@ -181,7 +181,7 @@ build:zpp-solver:
script: script:
- $ZPP_SOLVER_CLI -Pwithout-docker clean install - $ZPP_SOLVER_CLI -Pwithout-docker clean install
artifacts: artifacts:
paths: paths:
- $CI_PROJECT_DIR/zpp-solver/target - $CI_PROJECT_DIR/zpp-solver/target
build:ems: build:ems:
...@@ -225,7 +225,7 @@ build:ems-baguette-client: ...@@ -225,7 +225,7 @@ build:ems-baguette-client:
image: $MAVEN_IMAGE image: $MAVEN_IMAGE
script: script:
- $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install
build:ems-baguette-server: build:ems-baguette-server:
stage: build stage: build
image: $MAVEN_IMAGE image: $MAVEN_IMAGE
...@@ -264,28 +264,28 @@ build:ems-server: ...@@ -264,28 +264,28 @@ build:ems-server:
deploy:melodic-upperware: deploy:melodic-upperware:
stage: deploy stage: deploy
only: only:
- master - master
- rc3.0 - rc3.0
- rc3.1 - rc3.1
image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
services: services:
- $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
dependencies: dependencies:
- build:melodic-upperware - build:melodic-upperware
script: script:
- $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy - $DOCKER_CLI $MELODIC_UPPERWARE_CLI deploy
deploy:upperware-metamodel: deploy:upperware-metamodel:
stage: deploy stage: deploy
only: only:
- master - master
- rc3.0 - rc3.0
- rc3.1 - rc3.1
image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
services: services:
- $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
dependencies: dependencies:
- build:upperware-metamodel - build:upperware-metamodel
script: script:
- $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy - $DOCKER_CLI $UPPERWARE_METAMODEL_CLI deploy
...@@ -306,14 +306,14 @@ deploy:jwt-commons: ...@@ -306,14 +306,14 @@ deploy:jwt-commons:
deploy:melodic-commons: deploy:melodic-commons:
stage: deploy stage: deploy
only: only:
- master - master
- rc3.0 - rc3.0
- rc3.1 - rc3.1
image: $DOCKER_DIND_IMAGE image: $DOCKER_DIND_IMAGE
services: services:
- $DOCKER_DIND_SERVICE - $DOCKER_DIND_SERVICE
dependencies: dependencies:
- build:melodic-commons - build:melodic-commons
script: script:
- $DOCKER_CLI $MELODIC_COMMONS_CLI deploy - $DOCKER_CLI $MELODIC_COMMONS_CLI deploy
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment