Loading .gitlab-ci.yml +22 −40 Changes for .gitlab-ci.yml: 22 added lines, 40 removed lines. Original line number Diff line number Diff line Loading @@ -6,8 +6,7 @@ stages: - dev_image_build - dev_deploy - dev_workflows - develop_package - develop_image_build_release - develop_image_tag - prod_extract_next_release - prod_package - prod_release Loading Loading @@ -140,7 +139,7 @@ dev_package_job: paths: - target/** rules: - if: ' $CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' dev_image_build_job: Loading @@ -159,7 +158,7 @@ dev_image_build_job: dependencies: - dev_package_job rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' Loading Loading @@ -212,7 +211,7 @@ dev_deploy_job: dependencies: - dev_image_build_job rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' dev_workflows_job: Loading @@ -229,9 +228,26 @@ dev_workflows_job: dependencies: - dev_deploy_job rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' develop_image_tag_job: stage: develop_image_tag tags: - hypo image: name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:29.1.3 before_script: - docker info > /dev/null script: - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - echo "Promoting image for develop commit $CI_COMMIT_SHA" - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:dev-latest - docker push $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:dev-latest only: - develop prod_extract_next_release_job: image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts Loading Loading @@ -260,38 +276,6 @@ prod_extract_next_release_job: - main develop_package_job: stage: develop_package tags: - hypo script: - chmod +x ./mvnw - ./mvnw ${MAVEN_CLI_OPTS} clean package -DskipITs -DskipUTs -DskipTests ${MAVEN_OPTS} artifacts: paths: - target/** only: - develop develop_image_build_and_release_job: stage: develop_image_build_release tags: - hypo dependencies: - develop_package_job image: name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:29.1.3 before_script: - docker info > /dev/null script: - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - docker build --network host --pull -t $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:latest -f src/main/docker/Dockerfile.jvm . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:latest only: - develop prod_package_job: stage: prod_package tags: Loading Loading @@ -329,8 +313,6 @@ prod_package_job: - main prod_semantic_versioning_job: image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_release Loading Loading
.gitlab-ci.yml +22 −40 Changes for .gitlab-ci.yml: 22 added lines, 40 removed lines. Original line number Diff line number Diff line Loading @@ -6,8 +6,7 @@ stages: - dev_image_build - dev_deploy - dev_workflows - develop_package - develop_image_build_release - develop_image_tag - prod_extract_next_release - prod_package - prod_release Loading Loading @@ -140,7 +139,7 @@ dev_package_job: paths: - target/** rules: - if: ' $CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' dev_image_build_job: Loading @@ -159,7 +158,7 @@ dev_image_build_job: dependencies: - dev_package_job rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' Loading Loading @@ -212,7 +211,7 @@ dev_deploy_job: dependencies: - dev_image_build_job rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' dev_workflows_job: Loading @@ -229,9 +228,26 @@ dev_workflows_job: dependencies: - dev_deploy_job rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"' develop_image_tag_job: stage: develop_image_tag tags: - hypo image: name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:29.1.3 before_script: - docker info > /dev/null script: - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - echo "Promoting image for develop commit $CI_COMMIT_SHA" - docker pull $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA - docker tag $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:dev-latest - docker push $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:dev-latest only: - develop prod_extract_next_release_job: image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts Loading Loading @@ -260,38 +276,6 @@ prod_extract_next_release_job: - main develop_package_job: stage: develop_package tags: - hypo script: - chmod +x ./mvnw - ./mvnw ${MAVEN_CLI_OPTS} clean package -DskipITs -DskipUTs -DskipTests ${MAVEN_OPTS} artifacts: paths: - target/** only: - develop develop_image_build_and_release_job: stage: develop_image_build_release tags: - hypo dependencies: - develop_package_job image: name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:29.1.3 before_script: - docker info > /dev/null script: - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - docker build --network host --pull -t $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:latest -f src/main/docker/Dockerfile.jvm . - docker push $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:latest only: - develop prod_package_job: stage: prod_package tags: Loading Loading @@ -329,8 +313,6 @@ prod_package_job: - main prod_semantic_versioning_job: image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_release Loading