From 288275826b827ec0f05be580376332832b868cb6 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 09:53:10 +0000
Subject: [PATCH 1/6] added ci automation

---
 .gitlab-ci.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..92f4697
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+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
+
+maven_build:
+  extends: .maven_build
+
+docker_build:
+  extends: .docker_build
+  needs:
+    - maven_build
-- 
GitLab


From ba3572cb0468684f5083eb364d927c9aae3f2029 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 09:54:49 +0000
Subject: [PATCH 2/6] removed maven build

---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92f4697..ef8548e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,6 @@ include:
       - ci-templates/default.yml
       - ci-templates/build.yml
 
-maven_build:
-  extends: .maven_build
-
 docker_build:
   extends: .docker_build
   needs:
-- 
GitLab


From 8176fa61f1263b486fd44f9665bb760eecf1f64f Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 09:55:23 +0000
Subject: [PATCH 3/6] removed dependency to maven job

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef8548e..8a64474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,5 +7,3 @@ include:
 
 docker_build:
   extends: .docker_build
-  needs:
-    - maven_build
-- 
GitLab


From 97be98835b222d8fe80e2870319b540e507454fe Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 12:08:09 +0000
Subject: [PATCH 4/6] added angular build job

---
 .gitlab-ci.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a64474..354d7e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,21 @@ include:
     file: 
       - ci-templates/default.yml
       - ci-templates/build.yml
+    only:
+      - main
+      - develop
+
+  - 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
+
+angular_build:
+  extends: .angular_build
 
 docker_build:
   extends: .docker_build
-- 
GitLab


From 90981bfa36a00d2e68ab3957b6427ea0807ec2cd Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 12:08:47 +0000
Subject: [PATCH 5/6] added job dependency

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 354d7e8..9874628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,3 +22,5 @@ angular_build:
 
 docker_build:
   extends: .docker_build
+  needs:
+    - angular_build
-- 
GitLab


From 29741a0075b8b0cd9b54889397e3e6ef647b1fce Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 13:51:14 +0000
Subject: [PATCH 6/6] used dynamic ref in inheritance

---
 .gitlab-ci.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9874628..629bf6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,27 @@
 include:
   - project: osl/code/org.etsi.osl.main
-    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    ref: main
     file: 
       - ci-templates/default.yml
       - ci-templates/build.yml
-    only:
-      - main
-      - develop
+    rules:
+      - 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: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    ref: develop
     file: 
       - ci-templates/default.yml
       - ci-templates/build_unprotected.yml
-    except:
-      - main
-      - develop
+    rules:
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
 
 angular_build:
   extends: .angular_build
-- 
GitLab