Merged report step for git-clone

openshift-pipelines · Sep 17, 2024 · f23e091 · f23e091
1 parent cdbd70b
commit f23e091
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 21 deletions.
diff --git a/templates/common-steps.tpl b/templates/common-steps.tpl
@@ -1,4 +1,5 @@
 {{- define "common_steps" -}}
+  {{- $script := index . 2 -}}
   {{- $workspace := index . 1 -}}
   {{- with index . 0 -}}
 - name: prepare-and-run
@@ -10,7 +11,7 @@
   workingDir: $(workspaces.output.path)
   {{- end }}
   script: |
-{{- include "load_scripts" ( list . ( list "" ) ( list "/scripts/prepare.sh" "/scripts/git-run.sh" ) ) | nindent 4 }}
+{{- include "load_scripts" ( list . ( list "" ) ( list "/scripts/prepare.sh" "/scripts/git-run.sh" $script ) ) | nindent 4 }}
   volumeMounts:
     - name: scripts-dir
       mountPath: /scripts

diff --git a/templates/load-scripts.tpl b/templates/load-scripts.tpl
@@ -14,12 +14,13 @@ set -e
 printf '%s' "{{ $content | toString | b64enc }}" |base64 -d >"/scripts/{{ $name }}"
     {{- end }}
   {{- end }}
-ls /scripts/{{ $prefix }}*.sh;
 chmod +x /scripts/{{ $prefix }}*.sh;
 {{- end }}
 
 {{- range $i, $script := index . 2 -}}
+  {{- if ne $script "" -}}
 echo "Running Script {{ $script }}";
-  {{ $script }};
+    {{ $script }};
+  {{- end -}}
 {{- end }}
 {{- end -}}
diff --git a/templates/spec-git.tpl b/templates/spec-git.tpl
@@ -3,7 +3,7 @@
   {{- $params := index . 2 -}}
   {{- $results := index . 3 -}}
   {{- $env_vars := index . 4 -}}
-  {{- $steps := index . 5 -}}
+  {{- $script := index . 5 -}}
   {{- $workspace := index . 6 -}}
   {{- with index . 0 -}}
 workspaces:
@@ -47,10 +47,7 @@ stepTemplate:
 {{- end }}
 
 steps:
-{{- include "common_steps" ( list . $workspace ) | nindent 2 }}
-{{- if ne $steps "" }}
-  {{- include $steps . | nindent 2}}
-{{- end}}
+{{- include "common_steps" ( list . $workspace $script ) | nindent 2 }}
 
   {{- end -}}
 {{- end -}}
diff --git a/templates/steps-git-clone.tpl b/templates/steps-git-clone.tpl
diff --git a/templates/task-git-cli.yaml b/templates/task-git-cli.yaml
@@ -7,7 +7,7 @@
       "params.GIT_SCRIPT"
       "workspaces.source.path"
 }}
-{{ $steps := "" -}}
+{{ $script := "" -}}
 ---
 apiVersion: tekton.dev/v1
 kind: Task
@@ -27,4 +27,4 @@ spec:
     the task. This task needs authentication to git in order to push
     after the git operation.
 
-{{ include "spec_git" ( list . $workspaces $params $results $env_vars $steps "source" ) | nindent 2 }}
+{{ include "spec_git" ( list . $workspaces $params $results $env_vars $script "source" ) | nindent 2 }}
diff --git a/templates/task-git-clone.yaml b/templates/task-git-clone.yaml
@@ -12,7 +12,7 @@
       "results.URL.path"
       "workspaces.output.path"
 }}
-{{- $steps := "steps_git_clone" -}}
+{{- $script := "/scripts/report.sh" -}}
 ---
 apiVersion: tekton.dev/v1
 kind: Task
@@ -28,4 +28,4 @@ spec:
   description: |
     {{ .Chart.Description }}
 
-{{ include "spec_git" ( list . $workspaces $params $results $env_vars $steps "output" ) | nindent 2 }}
+{{ include "spec_git" ( list . $workspaces $params $results $env_vars $script "output" ) | nindent 2 }}