Loading .gitlab-ci.yml +25 −25 Original line number Diff line number Diff line Loading @@ -13,15 +13,15 @@ stages: default: image: registry.ubitech.eu/nsit/maestro-apps/maven:3.8.3-openjdk-17 image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17 variables: DOCKER_HOST: tcp://docker:2375 DOCKER_TLS_CERTDIR: "" DOCKER_DRIVER: overlay2 DOCKER_API_VERSION: "1.41" TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ubitech.eu/nsit/maestro-apps/" IMAGE_NAME: "maestro-portal-jvm" TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests" IMAGE_NAME: "hypo-portal-jvm" MAVEN_REPO: "${CI_PROJECT_ROOT_NAMESPACE}/.m2/repository" MAVEN_OPTS: "-Dmaven.repo.local=${CI_PROJECT_ROOT_NAMESPACE}/.m2/repository" COVERAGE_CONSOLIDATED_JACOCO_XML: "target/site/jacoco/jacoco.xml" Loading @@ -38,9 +38,9 @@ cache: dev_tests_job: stage: dev_test image: registry.ubitech.eu/nsit/maestro-apps/maven:3.8.3-openjdk-17-slim image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17-slim services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker before_script: Loading @@ -48,7 +48,7 @@ dev_tests_job: - chmod +x ./get-docker.sh - ./get-docker.sh - docker info - echo "$MAESTRO_APPS_TOKEN" | docker login $MAESTRO_APPS_REGISTRY -u $MAESTRO_APPS_USER --password-stdin - echo "$GROUP_ACCESS_TOKEN" | docker login $HYPO_APPS_REGISTRY -u $GROUP_ACCESS_NAME --password-stdin - touch ~/.testcontainers.properties - echo "ryuk.container.privileged=true" > ~/.testcontainers.properties script: Loading @@ -70,9 +70,9 @@ dev_tests_job: dev_verify_job: stage: dev_verify image: registry.ubitech.eu/nsit/maestro-apps/maven:3.8.3-openjdk-17 image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17 services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker script: Loading Loading @@ -130,9 +130,9 @@ dev_package_job: dev_image_build_job: stage: dev_image_build image: name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16 name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16 services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker before_script: Loading @@ -151,11 +151,11 @@ dev_image_build_job: dev_deploy_job: stage: dev_deploy image: name: registry.ubitech.eu/nsit/maestro-apps/python-argocd:3.9 name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/python-argocd:3.9 pull_policy: [always, if-not-present] before_script: - git clone --depth 1 --branch gitops-cd https://oauth2:$INSTALLER_TOKEN@$INSTALLER_REPO - cd io.maestro.installer.orchestrator.helm - git clone --depth 1 --branch gitops-cd https://oauth2:$GROUP_ACCESS_TOKEN@$INSTALLER_REPO - cd $INSTALLER_PATH script: - python3 scripts/helm_update.py $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $DEV_TMF_API_IMAGE $DEV_SONATA_CORE_IMAGE $DEV_SONATA_HELM_IMAGE $DEV_ZTC_CLIENT_IMAGE $DEV_SONATA_OSS_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_PORTAL Loading @@ -173,9 +173,9 @@ dev_deploy_job: - | set -e argocd login "$ARGOCD_SERVER" --username "$ARGOCD_USERNAME" --password "$ARGOCD_PASSWORD" --insecure argocd app get maestro --refresh >/dev/null argocd app wait maestro --sync --health --timeout 120 echo "Argo CD application 'maestro' is synced and healthy." argocd app get hypo --refresh >/dev/null argocd app wait hypo --sync --health --timeout 120 echo "Argo CD application 'hypo' is synced and healthy." dependencies: - dev_image_build_job rules: Loading @@ -185,10 +185,10 @@ dev_deploy_job: dev_workflows_job: stage: dev_workflows image: registry.ubitech.eu/nsit/maestro-apps/maven:3.9-eclipse-temurin-17 image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9-eclipse-temurin-17 before_script: # clone the integration tests repo - git clone --depth 1 "https://oauth2:$INTEGRATION_TOKEN@$INTEGRATION_REPO" - git clone --depth 1 "https://oauth2:$GROUP_ACCESS_TOKEN@$INTEGRATION_REPO" - cd org.etsi.osl.hypo.ops.cicd.integration.tests script: - mvn -B -q test "-Dkarate.env=staging" "-Dkarate.options=--tags @smoke-e2e-workflow" Loading @@ -202,10 +202,10 @@ dev_workflows_job: prod_extract_next_release_job: image: registry.ubitech.eu/nsit/maestro-apps/node:lts image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_extract_next_release variables: GITLAB_TOKEN: $GITLAB_TOKEN_SEMANTIC_VERSIONING GITLAB_TOKEN: $GROUP_ACCESS_TOKEN script: - DEV_RELEASE_VERSION=$(npx -y -p @semantic-release/commit-analyzer@9.0.2 Loading Loading @@ -244,7 +244,7 @@ prod_package_job: - git config --global user.name $GITLAB_USER_NAME - | if git commit -m "Release $DEV_RELEASE_VERSION: Update project version [skip ci]"; then git remote set-url origin "https://${GITLAB_USER_NAME}:${GITLAB_TOKEN_SEMANTIC_VERSIONING}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" git remote set-url origin "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" git push -f origin HEAD:main else Loading @@ -259,10 +259,10 @@ prod_package_job: prod_semantic_versioning_job: image: registry.ubitech.eu/nsit/maestro-apps/node:lts image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_release variables: GITLAB_TOKEN: $GITLAB_TOKEN_SEMANTIC_VERSIONING GITLAB_TOKEN: $GROUP_ACCESS_TOKEN before_script: - git pull origin HEAD script: Loading Loading @@ -292,9 +292,9 @@ prod_image_build_and_release_job: - prod_semantic_versioning_job - prod_package_job image: name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16 name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16 services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker before_script: Loading Loading
.gitlab-ci.yml +25 −25 Original line number Diff line number Diff line Loading @@ -13,15 +13,15 @@ stages: default: image: registry.ubitech.eu/nsit/maestro-apps/maven:3.8.3-openjdk-17 image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17 variables: DOCKER_HOST: tcp://docker:2375 DOCKER_TLS_CERTDIR: "" DOCKER_DRIVER: overlay2 DOCKER_API_VERSION: "1.41" TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ubitech.eu/nsit/maestro-apps/" IMAGE_NAME: "maestro-portal-jvm" TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests" IMAGE_NAME: "hypo-portal-jvm" MAVEN_REPO: "${CI_PROJECT_ROOT_NAMESPACE}/.m2/repository" MAVEN_OPTS: "-Dmaven.repo.local=${CI_PROJECT_ROOT_NAMESPACE}/.m2/repository" COVERAGE_CONSOLIDATED_JACOCO_XML: "target/site/jacoco/jacoco.xml" Loading @@ -38,9 +38,9 @@ cache: dev_tests_job: stage: dev_test image: registry.ubitech.eu/nsit/maestro-apps/maven:3.8.3-openjdk-17-slim image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17-slim services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker before_script: Loading @@ -48,7 +48,7 @@ dev_tests_job: - chmod +x ./get-docker.sh - ./get-docker.sh - docker info - echo "$MAESTRO_APPS_TOKEN" | docker login $MAESTRO_APPS_REGISTRY -u $MAESTRO_APPS_USER --password-stdin - echo "$GROUP_ACCESS_TOKEN" | docker login $HYPO_APPS_REGISTRY -u $GROUP_ACCESS_NAME --password-stdin - touch ~/.testcontainers.properties - echo "ryuk.container.privileged=true" > ~/.testcontainers.properties script: Loading @@ -70,9 +70,9 @@ dev_tests_job: dev_verify_job: stage: dev_verify image: registry.ubitech.eu/nsit/maestro-apps/maven:3.8.3-openjdk-17 image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17 services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker script: Loading Loading @@ -130,9 +130,9 @@ dev_package_job: dev_image_build_job: stage: dev_image_build image: name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16 name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16 services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker before_script: Loading @@ -151,11 +151,11 @@ dev_image_build_job: dev_deploy_job: stage: dev_deploy image: name: registry.ubitech.eu/nsit/maestro-apps/python-argocd:3.9 name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/python-argocd:3.9 pull_policy: [always, if-not-present] before_script: - git clone --depth 1 --branch gitops-cd https://oauth2:$INSTALLER_TOKEN@$INSTALLER_REPO - cd io.maestro.installer.orchestrator.helm - git clone --depth 1 --branch gitops-cd https://oauth2:$GROUP_ACCESS_TOKEN@$INSTALLER_REPO - cd $INSTALLER_PATH script: - python3 scripts/helm_update.py $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $DEV_TMF_API_IMAGE $DEV_SONATA_CORE_IMAGE $DEV_SONATA_HELM_IMAGE $DEV_ZTC_CLIENT_IMAGE $DEV_SONATA_OSS_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_PORTAL Loading @@ -173,9 +173,9 @@ dev_deploy_job: - | set -e argocd login "$ARGOCD_SERVER" --username "$ARGOCD_USERNAME" --password "$ARGOCD_PASSWORD" --insecure argocd app get maestro --refresh >/dev/null argocd app wait maestro --sync --health --timeout 120 echo "Argo CD application 'maestro' is synced and healthy." argocd app get hypo --refresh >/dev/null argocd app wait hypo --sync --health --timeout 120 echo "Argo CD application 'hypo' is synced and healthy." dependencies: - dev_image_build_job rules: Loading @@ -185,10 +185,10 @@ dev_deploy_job: dev_workflows_job: stage: dev_workflows image: registry.ubitech.eu/nsit/maestro-apps/maven:3.9-eclipse-temurin-17 image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.9-eclipse-temurin-17 before_script: # clone the integration tests repo - git clone --depth 1 "https://oauth2:$INTEGRATION_TOKEN@$INTEGRATION_REPO" - git clone --depth 1 "https://oauth2:$GROUP_ACCESS_TOKEN@$INTEGRATION_REPO" - cd org.etsi.osl.hypo.ops.cicd.integration.tests script: - mvn -B -q test "-Dkarate.env=staging" "-Dkarate.options=--tags @smoke-e2e-workflow" Loading @@ -202,10 +202,10 @@ dev_workflows_job: prod_extract_next_release_job: image: registry.ubitech.eu/nsit/maestro-apps/node:lts image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_extract_next_release variables: GITLAB_TOKEN: $GITLAB_TOKEN_SEMANTIC_VERSIONING GITLAB_TOKEN: $GROUP_ACCESS_TOKEN script: - DEV_RELEASE_VERSION=$(npx -y -p @semantic-release/commit-analyzer@9.0.2 Loading Loading @@ -244,7 +244,7 @@ prod_package_job: - git config --global user.name $GITLAB_USER_NAME - | if git commit -m "Release $DEV_RELEASE_VERSION: Update project version [skip ci]"; then git remote set-url origin "https://${GITLAB_USER_NAME}:${GITLAB_TOKEN_SEMANTIC_VERSIONING}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" git remote set-url origin "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" git push -f origin HEAD:main else Loading @@ -259,10 +259,10 @@ prod_package_job: prod_semantic_versioning_job: image: registry.ubitech.eu/nsit/maestro-apps/node:lts image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_release variables: GITLAB_TOKEN: $GITLAB_TOKEN_SEMANTIC_VERSIONING GITLAB_TOKEN: $GROUP_ACCESS_TOKEN before_script: - git pull origin HEAD script: Loading Loading @@ -292,9 +292,9 @@ prod_image_build_and_release_job: - prod_semantic_versioning_job - prod_package_job image: name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16 name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16 services: - name: registry.ubitech.eu/nsit/maestro-apps/docker:20.10.16-dind - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind command: [ "--tls=false" ] alias: docker before_script: Loading