From 060a9260372f83716aa5d738aa03f626fded914c Mon Sep 17 00:00:00 2001
From: Michael Sauter <michael.sauter@boehringer-ingelheim.com>
Date: Tue, 5 Mar 2024 09:22:24 +0100
Subject: [PATCH] Update ods.yaml structure

---
 basic/cookiecutter.json                       |  1 -
 basic/{{cookiecutter.__repo_slug}}/ods.yaml   | 26 +++++++++----------
 jupyter-lab/cookiecutter.json                 |  1 -
 .../{{cookiecutter.__repo_slug}}/ods.yaml     | 26 +++++++++----------
 postgres-operator/cookiecutter.json           |  1 -
 .../{{cookiecutter.__repo_slug}}/ods.yaml     | 19 ++++++--------
 6 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/basic/cookiecutter.json b/basic/cookiecutter.json
index 202ddb1..e0031b2 100644
--- a/basic/cookiecutter.json
+++ b/basic/cookiecutter.json
@@ -4,7 +4,6 @@
     "component_name": "bar",
     "__component_slug": "{{cookiecutter.component_name.lower().replace(' ', '-')}}",
     "__repo_slug": "{{cookiecutter.__project_slug}}-{{cookiecutter.__component_slug}}",
-    "task_suffix": "-v0-7-0",
     "_copy_without_render": [
         "chart/templates/*"
     ]
diff --git a/basic/{{cookiecutter.__repo_slug}}/ods.yaml b/basic/{{cookiecutter.__repo_slug}}/ods.yaml
index 70730e3..fd2f778 100644
--- a/basic/{{cookiecutter.__repo_slug}}/ods.yaml
+++ b/basic/{{cookiecutter.__repo_slug}}/ods.yaml
@@ -1,27 +1,27 @@
-branchToEnvironmentMapping:
-- branch: '*'
-  environment: dev
-
-environments:
-- name: dev
-  namespace: {{ cookiecutter.__project_slug }}-dev
-  stage: dev
-
 pipeline:
   tasks:
   - name: package
     taskRef:
-      kind: Task
-      name: ods-package-image{{ cookiecutter.task_suffix }}
+      resolver: git
+      params:
+      - { name: url, value: https://github.com/opendevstack/ods-pipeline-image.git }
+      - { name: revision, value: v0.3.0 }
+      - { name: pathInRepo, value: tasks/package.yaml }
     workspaces:
     - name: source
       workspace: shared-workspace
   - name: deploy
     taskRef:
-      kind: Task
-      name: ods-deploy-helm{{ cookiecutter.task_suffix }}
+      resolver: git
+      params:
+      - { name: url, value: https://github.com/opendevstack/ods-pipeline-helm.git }
+      - { name: revision, value: v0.4.1 }
+      - { name: pathInRepo, value: tasks/deploy.yaml }
     runAfter:
     - package
+    params:
+    - name: namespace
+      value: {{ cookiecutter.__project_slug }}-dev
     workspaces:
     - name: source
       workspace: shared-workspace
diff --git a/jupyter-lab/cookiecutter.json b/jupyter-lab/cookiecutter.json
index 202ddb1..e0031b2 100644
--- a/jupyter-lab/cookiecutter.json
+++ b/jupyter-lab/cookiecutter.json
@@ -4,7 +4,6 @@
     "component_name": "bar",
     "__component_slug": "{{cookiecutter.component_name.lower().replace(' ', '-')}}",
     "__repo_slug": "{{cookiecutter.__project_slug}}-{{cookiecutter.__component_slug}}",
-    "task_suffix": "-v0-7-0",
     "_copy_without_render": [
         "chart/templates/*"
     ]
diff --git a/jupyter-lab/{{cookiecutter.__repo_slug}}/ods.yaml b/jupyter-lab/{{cookiecutter.__repo_slug}}/ods.yaml
index b45222a..fd2f778 100644
--- a/jupyter-lab/{{cookiecutter.__repo_slug}}/ods.yaml
+++ b/jupyter-lab/{{cookiecutter.__repo_slug}}/ods.yaml
@@ -1,27 +1,27 @@
-branchToEnvironmentMapping:
-- branch: '*'
-  environment: dev
-
-environments:
-- name: dev
-  namespace: {{cookiecutter.__project_slug}}-dev
-  stage: dev
-
 pipeline:
   tasks:
   - name: package
     taskRef:
-      kind: Task
-      name: ods-package-image{{cookiecutter.task_suffix}}
+      resolver: git
+      params:
+      - { name: url, value: https://github.com/opendevstack/ods-pipeline-image.git }
+      - { name: revision, value: v0.3.0 }
+      - { name: pathInRepo, value: tasks/package.yaml }
     workspaces:
     - name: source
       workspace: shared-workspace
   - name: deploy
     taskRef:
-      kind: Task
-      name: ods-deploy-helm{{cookiecutter.task_suffix}}
+      resolver: git
+      params:
+      - { name: url, value: https://github.com/opendevstack/ods-pipeline-helm.git }
+      - { name: revision, value: v0.4.1 }
+      - { name: pathInRepo, value: tasks/deploy.yaml }
     runAfter:
     - package
+    params:
+    - name: namespace
+      value: {{ cookiecutter.__project_slug }}-dev
     workspaces:
     - name: source
       workspace: shared-workspace
diff --git a/postgres-operator/cookiecutter.json b/postgres-operator/cookiecutter.json
index 202ddb1..e0031b2 100644
--- a/postgres-operator/cookiecutter.json
+++ b/postgres-operator/cookiecutter.json
@@ -4,7 +4,6 @@
     "component_name": "bar",
     "__component_slug": "{{cookiecutter.component_name.lower().replace(' ', '-')}}",
     "__repo_slug": "{{cookiecutter.__project_slug}}-{{cookiecutter.__component_slug}}",
-    "task_suffix": "-v0-7-0",
     "_copy_without_render": [
         "chart/templates/*"
     ]
diff --git a/postgres-operator/{{cookiecutter.__repo_slug}}/ods.yaml b/postgres-operator/{{cookiecutter.__repo_slug}}/ods.yaml
index fc7cabe..848de9d 100644
--- a/postgres-operator/{{cookiecutter.__repo_slug}}/ods.yaml
+++ b/postgres-operator/{{cookiecutter.__repo_slug}}/ods.yaml
@@ -1,18 +1,15 @@
-branchToEnvironmentMapping:
-- branch: '*'
-  environment: dev
-
-environments:
-- name: dev
-  namespace: {{cookiecutter.__project_slug}}-dev
-  stage: dev
-
 pipeline:
   tasks:
   - name: deploy
     taskRef:
-      kind: Task
-      name: ods-deploy-helm{{cookiecutter.task_suffix}}
+      resolver: git
+      params:
+      - { name: url, value: https://github.com/opendevstack/ods-pipeline-helm.git }
+      - { name: revision, value: v0.4.1 }
+      - { name: pathInRepo, value: tasks/deploy.yaml }
+    params:
+    - name: namespace
+      value: {{ cookiecutter.__project_slug }}-dev
     workspaces:
     - name: source
       workspace: shared-workspace