From f8e282a37890538e9cb1c116eebb07e0b1e1d205 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 12:18:41 +0000
Subject: [PATCH] refactored ci to use inheritance

---
 .gitlab-ci.yml                | 32 +++++++++++++++++++++++++-------
 Dockerfile.osom => Dockerfile |  0
 2 files changed, 25 insertions(+), 7 deletions(-)
 rename Dockerfile.osom => Dockerfile (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db0ad64..18e0625 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,26 @@
-stages:
-  - deploy
+include:
+  - project: osl/code/org.etsi.osl.main
+    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    only:
+      - main
+      - develop
 
-deploy:
-  stage: deploy
-  image: maven:3.9.5-ibm-semeru-17-focal
-  script:
-    - mvn deploy -s ci_settings.xml -DskipTests
+  - project: osl/code/org.etsi.osl.main
+    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build_unprotected.yml
+    except:
+      - main
+      - develop
+
+maven_build:
+  extends: .maven_build
+
+docker_build:
+  extends: .docker_build
+  needs:
+    - maven_build
diff --git a/Dockerfile.osom b/Dockerfile
similarity index 100%
rename from Dockerfile.osom
rename to Dockerfile
-- 
GitLab