Loading .gitlab-ci.yml +47 −8 Original line number Diff line number Diff line Loading @@ -16,11 +16,12 @@ default: 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_HOST: tcp://localhost:2375 DOCKER_TLS_CERTDIR: "" DOCKER_DRIVER: overlay2 DOCKER_API_VERSION: "1.41" TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests" #DOCKER_API_VERSION: "1.41" TESTCONTAINERS_HOST_OVERRIDE: "localhost" 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" Loading @@ -36,8 +37,11 @@ cache: - ${SONAR_USER_HOME}/cache dev_tests_job: stage: dev_test tags: - hypo 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: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind Loading @@ -47,7 +51,7 @@ dev_tests_job: - curl -fsSL https://get.docker.com -o get-docker.sh - chmod +x ./get-docker.sh - ./get-docker.sh - docker info - echo "127.0.0.1 $(hostname)" >> /etc/hosts - 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 Loading @@ -70,6 +74,8 @@ dev_tests_job: dev_verify_job: stage: dev_verify tags: - hypo image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17 services: - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind Loading @@ -90,6 +96,8 @@ dev_verify_job: dev_measure_quality_job: stage: dev_measure_quality tags: - hypo # Needs init_job to retrieve ENV variables. needs: - dev_tests_job Loading Loading @@ -117,6 +125,8 @@ dev_measure_quality_job: dev_package_job: stage: dev_package tags: - hypo script: - chmod +x ./mvnw - ./mvnw ${MAVEN_CLI_OPTS} clean package -DskipITs -DskipUTs -DskipTests ${MAVEN_OPTS} Loading @@ -129,6 +139,8 @@ dev_package_job: dev_image_build_job: stage: dev_image_build tags: - hypo image: name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16 services: Loading @@ -150,18 +162,35 @@ dev_image_build_job: dev_deploy_job: stage: dev_deploy tags: - hypo image: 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: - mkdir -p /tmp/bin - export PATH="/tmp/bin:$PATH" - curl -L -o /tmp/age.tar.gz https://github.com/FiloSottile/age/releases/download/v1.2.1/age-v1.2.1-linux-amd64.tar.gz - tar -xzf /tmp/age.tar.gz -C /tmp - mv /tmp/age/age /tmp/age/age-keygen /tmp/bin/ - curl -L -o /tmp/bin/sops https://github.com/getsops/sops/releases/download/v3.10.2/sops-v3.10.2.linux.amd64 - chmod +x /tmp/bin/sops - sops --version - age --version - git clone --depth 1 --branch gitops-cd https://oauth2:$GROUP_ACCESS_TOKEN@$INSTALLER_REPO - cd $INSTALLER_PATH - echo "$SOPS_AGE_KEY_PRIVATE" > ~/.sops-age-key.txt - chmod 600 ~/.sops-age-key.txt - export SOPS_AGE_KEY_FILE=~/.sops-age-key.txt 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 - git add . - git config --global user.email "$GITLAB_USER_NAME" - git config --global user.name "$GITLAB_USER_EMAIL" - sops --decrypt charts/hypo/values-cd.enc.yaml > charts/hypo/values-cd.yaml - python3 scripts/helm_update_etsi.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_SONATA_OSS_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_PORTAL - sops --encrypt --age $SOPS_AGE_KEY_PUBLIC charts/hypo/values-cd.yaml > charts/hypo/values-cd.enc.yaml - rm -f charts/hypo/values-cd.yaml ~/.sops-age-key.txt - git add charts/hypo/values-cd.enc.yaml - git config --global user.email "$GITLAB_USER_EMAIL" - git config --global user.name "$GITLAB_USER_NAME" - | if git commit -m "Update values.yaml for GitOps CD [skip ci]"; then Loading @@ -185,6 +214,8 @@ dev_deploy_job: dev_workflows_job: stage: dev_workflows tags: - hypo 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 Loading @@ -204,6 +235,8 @@ dev_workflows_job: prod_extract_next_release_job: image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_extract_next_release tags: - hypo variables: GITLAB_TOKEN: $GROUP_ACCESS_TOKEN script: Loading @@ -228,6 +261,8 @@ prod_extract_next_release_job: prod_package_job: stage: prod_package tags: - hypo dependencies: - prod_extract_next_release_job script: Loading Loading @@ -264,6 +299,8 @@ prod_package_job: 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 tags: - hypo variables: GITLAB_TOKEN: $GROUP_ACCESS_TOKEN before_script: Loading Loading @@ -291,6 +328,8 @@ prod_semantic_versioning_job: prod_image_build_and_release_job: stage: prod_image_build_release tags: - hypo dependencies: - prod_semantic_versioning_job - prod_package_job Loading src/main/resources/application.properties +4 −4 Original line number Diff line number Diff line Loading @@ -6,10 +6,10 @@ quarkus.security.auth.enabled-in-dev-mode=false quarkus.mongodb.devservices.enabled = true quarkus.hibernate-orm.enabled = false quarkus.log.category."io.quarkus.mongodb.panache.common.runtime".level=DEBUG quarkus.datasource.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/postgres:14 quarkus.kafka.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/vectorized/redpanda:v24.1.2 quarkus.keycloak.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/keycloak/keycloak:22.0.3 quarkus.mongodb.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/mongo:4.4 quarkus.datasource.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/postgres:14 quarkus.kafka.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/vectorized/redpanda:v24.1.2 quarkus.keycloak.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/keycloak/keycloak:22.0.3 quarkus.mongodb.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/mongo:4.4 quarkus.log.handler.kafka.enabled=false quarkus.log.handler.kafka.broker-list=localhost:9092 quarkus.log.handler.kafka.topic=app-logs Loading Loading
.gitlab-ci.yml +47 −8 Original line number Diff line number Diff line Loading @@ -16,11 +16,12 @@ default: 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_HOST: tcp://localhost:2375 DOCKER_TLS_CERTDIR: "" DOCKER_DRIVER: overlay2 DOCKER_API_VERSION: "1.41" TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests" #DOCKER_API_VERSION: "1.41" TESTCONTAINERS_HOST_OVERRIDE: "localhost" 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" Loading @@ -36,8 +37,11 @@ cache: - ${SONAR_USER_HOME}/cache dev_tests_job: stage: dev_test tags: - hypo 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: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind Loading @@ -47,7 +51,7 @@ dev_tests_job: - curl -fsSL https://get.docker.com -o get-docker.sh - chmod +x ./get-docker.sh - ./get-docker.sh - docker info - echo "127.0.0.1 $(hostname)" >> /etc/hosts - 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 Loading @@ -70,6 +74,8 @@ dev_tests_job: dev_verify_job: stage: dev_verify tags: - hypo image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/maven:3.8.3-openjdk-17 services: - name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16-dind Loading @@ -90,6 +96,8 @@ dev_verify_job: dev_measure_quality_job: stage: dev_measure_quality tags: - hypo # Needs init_job to retrieve ENV variables. needs: - dev_tests_job Loading Loading @@ -117,6 +125,8 @@ dev_measure_quality_job: dev_package_job: stage: dev_package tags: - hypo script: - chmod +x ./mvnw - ./mvnw ${MAVEN_CLI_OPTS} clean package -DskipITs -DskipUTs -DskipTests ${MAVEN_OPTS} Loading @@ -129,6 +139,8 @@ dev_package_job: dev_image_build_job: stage: dev_image_build tags: - hypo image: name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/docker:20.10.16 services: Loading @@ -150,18 +162,35 @@ dev_image_build_job: dev_deploy_job: stage: dev_deploy tags: - hypo image: 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: - mkdir -p /tmp/bin - export PATH="/tmp/bin:$PATH" - curl -L -o /tmp/age.tar.gz https://github.com/FiloSottile/age/releases/download/v1.2.1/age-v1.2.1-linux-amd64.tar.gz - tar -xzf /tmp/age.tar.gz -C /tmp - mv /tmp/age/age /tmp/age/age-keygen /tmp/bin/ - curl -L -o /tmp/bin/sops https://github.com/getsops/sops/releases/download/v3.10.2/sops-v3.10.2.linux.amd64 - chmod +x /tmp/bin/sops - sops --version - age --version - git clone --depth 1 --branch gitops-cd https://oauth2:$GROUP_ACCESS_TOKEN@$INSTALLER_REPO - cd $INSTALLER_PATH - echo "$SOPS_AGE_KEY_PRIVATE" > ~/.sops-age-key.txt - chmod 600 ~/.sops-age-key.txt - export SOPS_AGE_KEY_FILE=~/.sops-age-key.txt 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 - git add . - git config --global user.email "$GITLAB_USER_NAME" - git config --global user.name "$GITLAB_USER_EMAIL" - sops --decrypt charts/hypo/values-cd.enc.yaml > charts/hypo/values-cd.yaml - python3 scripts/helm_update_etsi.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_SONATA_OSS_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_PORTAL - sops --encrypt --age $SOPS_AGE_KEY_PUBLIC charts/hypo/values-cd.yaml > charts/hypo/values-cd.enc.yaml - rm -f charts/hypo/values-cd.yaml ~/.sops-age-key.txt - git add charts/hypo/values-cd.enc.yaml - git config --global user.email "$GITLAB_USER_EMAIL" - git config --global user.name "$GITLAB_USER_NAME" - | if git commit -m "Update values.yaml for GitOps CD [skip ci]"; then Loading @@ -185,6 +214,8 @@ dev_deploy_job: dev_workflows_job: stage: dev_workflows tags: - hypo 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 Loading @@ -204,6 +235,8 @@ dev_workflows_job: prod_extract_next_release_job: image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts stage: prod_extract_next_release tags: - hypo variables: GITLAB_TOKEN: $GROUP_ACCESS_TOKEN script: Loading @@ -228,6 +261,8 @@ prod_extract_next_release_job: prod_package_job: stage: prod_package tags: - hypo dependencies: - prod_extract_next_release_job script: Loading Loading @@ -264,6 +299,8 @@ prod_package_job: 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 tags: - hypo variables: GITLAB_TOKEN: $GROUP_ACCESS_TOKEN before_script: Loading Loading @@ -291,6 +328,8 @@ prod_semantic_versioning_job: prod_image_build_and_release_job: stage: prod_image_build_release tags: - hypo dependencies: - prod_semantic_versioning_job - prod_package_job Loading
src/main/resources/application.properties +4 −4 Original line number Diff line number Diff line Loading @@ -6,10 +6,10 @@ quarkus.security.auth.enabled-in-dev-mode=false quarkus.mongodb.devservices.enabled = true quarkus.hibernate-orm.enabled = false quarkus.log.category."io.quarkus.mongodb.panache.common.runtime".level=DEBUG quarkus.datasource.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/postgres:14 quarkus.kafka.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/vectorized/redpanda:v24.1.2 quarkus.keycloak.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/keycloak/keycloak:22.0.3 quarkus.mongodb.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/mongo:4.4 quarkus.datasource.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/postgres:14 quarkus.kafka.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/vectorized/redpanda:v24.1.2 quarkus.keycloak.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/keycloak/keycloak:22.0.3 quarkus.mongodb.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/mongo:4.4 quarkus.log.handler.kafka.enabled=false quarkus.log.handler.kafka.broker-list=localhost:9092 quarkus.log.handler.kafka.topic=app-logs Loading