From 161cd9e5790f1e53871ccec796bbc4c2b15bf329 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 19 Dec 2023 12:22:51 +0000 Subject: [PATCH] added ci automation with inheritance --- .gitlab-ci.yml | 26 ++++++++++++++++++++++++++ Dockerfile.oasapi => Dockerfile | 0 2 files changed, 26 insertions(+) create mode 100644 .gitlab-ci.yml rename Dockerfile.oasapi => Dockerfile (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..18e0625 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,26 @@ +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 + + - 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.oasapi b/Dockerfile similarity index 100% rename from Dockerfile.oasapi rename to Dockerfile -- GitLab