From 8a13d3b155c9d2fd013c384842a2f97490577593 Mon Sep 17 00:00:00 2001
From: Dorian Turba <commit.9wuzh@slmail.me>
Date: Tue, 13 Aug 2024 11:13:21 +0200
Subject: [PATCH] update cicd

---
 .gitlab-ci.yml                                  | 9 ++++-----
 {{ cookiecutter.template_name }}/.gitlab-ci.yml | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 {{ cookiecutter.template_name }}/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08dad17..a7179ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,7 @@
 include:
-    -   remote: 'https://gitlab.com/dorianturba-templates/r2devops_catalog/-/raw/main/templates/python/testing/pytest/pytest.yml'
-    -   remote: 'https://gitlab.com/swepy/cicd-templates/release-by-changelog/-/raw/main/release-by-changelog.yml'
+  - component: $CI_SERVER_HOST/swepy/cicd-templates/release-by-changelog/release-by-changelog@1.0.0
+  - component: $CI_SERVER_FQDN/swepy/cicd-templates/pytest/pytest@0.1.0
 
 pytest:
-    variables:
-        PYTHON_SETUP: "pip install -r requirements/dev_requirements.txt --quiet"
-        PYTEST_RUN_CMD: "pytest tests"
+  before_script:
+    - pip install -r requirements/dev_requirements.txt --quiet
diff --git a/{{ cookiecutter.template_name }}/.gitlab-ci.yml b/{{ cookiecutter.template_name }}/.gitlab-ci.yml
new file mode 100644
index 0000000..e3a2bd0
--- /dev/null
+++ b/{{ cookiecutter.template_name }}/.gitlab-ci.yml	
@@ -0,0 +1,2 @@
+include:
+  - component: $CI_SERVER_HOST/swepy/cicd-templates/release-by-changelog/release-by-changelog@1.0.0
-- 
GitLab