Release 6.1.2

.gitlab-ci.yml

@@ -1,34 +1,7 @@
 variables:
-    IMAGE: crest-service
-    VERSION: '0.2'
-    REGISTRY: 'svomtest.svom.fr:5543'
-#    REGISTRY: 'svomtest.svom.fr:5543'
-    CONTAINER_IMAGE: $REGISTRY/$IMAGE:$VERSION
-    WEB_CONTAINER_IMAGE: $REGISTRY/crest-ui:$VERSION
+    IMAGE: crest21-service
+    VERSION: '6.2'
     GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-    GIT_SSL_NO_VERIFY: "true"
-
-  # When using dind service we need to instruct docker, to talk with the
-  # daemon started inside of the service. The daemon is available with
-  # a network connection instead of the default /var/run/docker.sock socket.
-  #
-  # The 'docker' hostname is the alias of the service container as described at
-  # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services
-  #
-  # Note that if you're using Kubernetes executor, the variable should be set to
-  # tcp://localhost:2375 because of how Kubernetes executor connects services
-  # to the job container
-#    DOCKER_HOST: tcp://docker:2375/
-  # When using dind, it's wise to use the overlayfs driver for
-  # improved performance.
-#    DOCKER_DRIVER: overlay2
-
-# Select a runner
-# use tag keyword (see below)
-
-#services:
-#  - docker:dind
-
 
 # Make the gradle wrapper executable. This essentially downloads a copy of
 # Gradle to build the project with.
@@ -37,168 +10,61 @@ variables:
 before_script:
   - chmod +x gradlew
 
-# We redirect the gradle user home using -g so that it caches the
-# wrapper and dependencies.
-# https://docs.gradle.org/current/userguide/gradle_command_line.html
-#
-# Unfortunately it also caches the build output so
-# cleaning removes reminants of any cached builds.
-# The assemble task actually builds the project.
-# If it fails here, the tests can't run.
-#build:
-#  stage: build
-#  script:
-#    - ./gradlew -g /cache/.gradle clean :crestdb-web:assemble -PwarName=crest.war
-#  allow_failure: false
-
-# Use the generated build output to run the tests.
-#test:
-#  stage: test
-#  script:
-#    - ./gradlew -g /cache/.gradle check
+include:
+  - project : 'ci-tools/container-image-ci-templates'
+    file : 'kaniko-image.gitlab-ci.yml'
+    ref: master
+  - project : 'atlas-devops/ci-templates'
+    file : 'helm/helm.yml'
+    ref: main
 
 stages:
  - package_application
- - webui
- - build
- - release
+ #- build
  - sonar_application
- - redeploy
-
-package_svom_application:
-  stage: package_application
-  image: openjdk:11-jdk-alpine
-  script:
-   - ./gradlew -g /cache/.gradle clean assemble -PwarName=crest.war
-  allow_failure: false
-  artifacts:
-    paths:
-    - ./crestdb-web/build/libs/crest.war
-    expire_in: 1 week
-  only:
-  - cms-v0
-
-release:
-  stage: release
-  image: docker:19.03.1
-  services:
-    - docker:19.03.1-dind
-  before_script:
-      - docker login -u svom -p $SVOMREGISTRYPSWD $REGISTRY
-  script:
-      - docker build --rm --tag=$CONTAINER_IMAGE --file Dockerfile .
-      - docker push $CONTAINER_IMAGE
-  only:
-  - cms-v0
-
-webui:
-  stage: webui
-  environment: dc0
-  tags:
-    - dc0-shell
-  script:
-    - docker info
-    - docker build --tag=$WEB_CONTAINER_IMAGE --file ./web-ui/crest-ui/Dockerfile.nginx.svom ./web-ui/crest-ui/
-  only:
-  - svom-dc1
-
-sonar_application:
-  stage: sonar_application
-  image: openjdk:11-jdk-alpine
-  script:
-   - ./gradlew sonarqube -Dsonar.projectKey=crestdb -Dsonar.host.url=http://svom1.lal.in2p3.fr:20090 -Dsonar.login=f50918d8b780181f947ae83b42e78983ffde4bf3
-  allow_failure: false
-  only:
-  - stable
-
-# build_svom_docker_image:
-#   stage: build
-#   environment: dc0
-#   tags:
-#     - dc0-shell
-#   image: java:8
-#   script:
-#     - docker info
-#     - docker build --tag=$CONTAINER_IMAGE --file Dockerfile.svom .
-#   only:
-#   - svom-dc1
-
-# webui:
-#   stage: webui
-#   tags:
-#     - dc0-shell
-#   script:
-#     - docker info
-#     - docker build --tag=$WEB_CONTAINER_IMAGE ./web-ui/crest-ui/
-#   only:
-#   - svom-dc0
-
-# registry-push:
-#   stage: release
-#   environment: dc0
-#   tags:
-#     - dc0-shell
-#   script:
-#     - docker login -u svom -p $SVOMREGISTRYPSWD $REGISTRY
-#     - docker push $CONTAINER_IMAGE
-#   only:
-#   - svom-dc1
+ - push
 
 package_cern_application:
   stage: package_application
   environment: cern
-  only:
-    refs:
-      - master
-    variables:
-      - $REMOTE_NAME == "cern"
-  image: adoptopenjdk:11-jdk-openj9
+  image: registry.cern.ch/docker.io/eclipse-temurin:23-alpine
+  services:
+    - registry.cern.ch/docker.io/redis:latest
+  variables:
+    REDIS_HOST: redis
+    REDIS_PORT: 6379
   script:
-   - ./gradlew -g /cache/.gradle clean assemble -PwarName=crest.war
+   - ./gradlew clean build
   allow_failure: false
   artifacts:
    paths:
-   - ./crestdb-web/build/libs/crest.war
+   - ./build/libs/crest.jar
 
-package_cern_web_application:
-  stage: webui
-  environment: cern
-  only:
-    refs:
-      - master
-    variables:
-      - $REMOTE_NAME == "cern"
-  image: node:lts-alpine
-  script:
-   - ./vuecompile.sh
-  allow_failure: false
-  artifacts:
-   paths:
-   - ./web-ui/crest-ui/dist
+# Can be used to test packaging helm chart, before merging to master for instance
+#build_helm:
+#  extends: .deploy_helm
+#  stage: build
+#  variables:
+#    REGISTRY_CHART_PATH: registry.cern.ch/crest/charts
 
 
-build_cern_docker_image:
-  stage: build
+build_container_job:
+  rules:
+    - if: $DO_DOCKER_IMAGE == "yes" && $CI_PIPELINE_SOURCE != 'merge_request_event' && $SITE == "cern"
   environment: cern
-  only:
-    refs:
-      - master
-    variables:
-      - $REMOTE_NAME == "cern"
-  tags:
-   - docker-image-build
-  script: "echo building $CI_REGISTRY_IMAGE:runner" # No empty scripts are allowed
+  stage: push
+  extends: .build_kaniko
   variables:
-   TO: $CI_REGISTRY_IMAGE:latest # Where to push resulting image
+    REGISTRY_IMAGE_PATH : "registry.cern.ch/crest/$IMAGE:$VERSION"
+    CONTEXT_DIR: ""
+    PUSH_IMAGE: "true"
+    DOCKER_FILE_NAME: "Dockerfile"
 
 
-redeploy:
-  stage: redeploy
-  environment: cern
-  only:
-    refs:
-      - master
-    variables:
-      - $REMOTE_NAME == "cern"
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
-  script: "oc import-image $IMAGE_NAME  --server=$SERVER --namespace $NAMESPACE --all --token=$IMAGE_IMPORT_TOKEN"
+push_helm:
+  extends: .deploy_helm
+  stage: push
+  variables:
+    REGISTRY_CHART_PATH: registry.cern.ch/crest/charts
+    PUSH_CHART: "true"
+