From 18aa19bb0eb09b20e4f5708c9ec12d72a2edbdd7 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 16 Apr 2025 21:37:01 +0000
Subject: [PATCH] fixing ci.yml

---
 .gitlab-ci.yml                     | 39 ++++++++++++++++++++++--------
 ci-templates/build.yml             | 24 ------------------
 ci-templates/default.yml           | 17 -------------
 src/main/resources/application.yml |  2 +-
 4 files changed, 30 insertions(+), 52 deletions(-)
 delete mode 100644 ci-templates/build.yml
 delete mode 100644 ci-templates/default.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e081dbd..e5ec948 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,35 @@
-include: 
-  - ci-templates/default.yml
-  - ci-templates/build.yml
-
-  - local: ci-templates/build.yml
-    rules:
-      - if: '$CI_COMMIT_REF_NAME == "main" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED'
-
-  - local: ci-templates/build_unprotected.yml
+include:
+  - project: osl/code/org.etsi.osl.main
+    ref: main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME == "main"'
   
+  - project: osl/code/org.etsi.osl.main
+    ref: develop
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME == "develop"'
 
+  - project: osl/code/org.etsi.osl.main
+    ref: $CI_COMMIT_REF_NAME
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
 
+  - project: osl/code/org.etsi.osl.main
+    ref: develop
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build_unprotected.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'
 
 maven_build:
   extends: .maven_build
@@ -20,3 +38,4 @@ docker_build:
   extends: .docker_build
   needs:
     - maven_build
+
diff --git a/ci-templates/build.yml b/ci-templates/build.yml
deleted file mode 100644
index c0ff254..0000000
--- a/ci-templates/build.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-.maven_build:
-  extends: .default
-  stage: build
-  image: maven:3.9.5-ibm-semeru-17-focal
-  script:
-    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
-  artifacts:
-    paths:
-      - target/
-
-.docker_build:
-  extends: .default
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - export DOCKER_TAG=$APP_VERSION
-    - |
-      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
-        echo "Pushing Docker image with tag 'latest'"
-        export DOCKER_TAG=latest
-      fi
-    - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${CI_REGISTRY_IMAGE}:$DOCKER_TAG"
diff --git a/ci-templates/default.yml b/ci-templates/default.yml
deleted file mode 100644
index e49b634..0000000
--- a/ci-templates/default.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-stages:
-  - .pre
-  - build
-  - test
-  - post
-  - security
-
-.default:
-  before_script:
-    - |
-      if [ "$CI_COMMIT_REF_PROTECTED" = true ] && [ -n "$CI_COMMIT_TAG" ]; then
-        export APP_VERSION=$CI_COMMIT_TAG
-      elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then
-        export APP_VERSION="develop"
-      else
-        export APP_VERSION=$CI_COMMIT_REF_NAME
-      fi
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8c55313..d5e020b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     multipart.max-file-size: 10MB
     multipart.max-request-size: 10MB
   activemq:
-    brokerUrl: tcp://portal.openslice.eu:61616?jms.watchTopicAdvisories=false
+    brokerUrl: tcp://osl.etsi.org:61616?jms.watchTopicAdvisories=false
     user: artemis
     password: artemis
     pool:
-- 
GitLab