Removed Load Scripts Step

openshift-pipelines · Sep 2, 2024 · 4106455 · 4106455
1 parent 478f5ca
commit 4106455
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 35 deletions.
diff --git a/templates/load-scripts.tpl b/templates/load-scripts.tpl
@@ -5,29 +5,22 @@
 */ -}}
 
 {{- define "load_scripts" -}}
-  {{- $global := index . 0 -}}
-- name: load-scripts
-  image: {{ $global.Values.images.bash }}
-  workingDir: /scripts
-  script: |
-    set -e
-  {{- range $i, $prefix := . -}}
-    {{- if gt $i 0 }}
-      {{- range $path, $content := $global.Files.Glob "scripts/*.sh" }}
-        {{- $name := trimPrefix "scripts/" $path }}
-        {{- if or ( hasPrefix $prefix $name ) ( hasPrefix "common" $name ) }}
-    printf '%s' "{{ $content | toString | b64enc }}" |base64 -d >{{ $name }}
-        {{- end }}
-      {{- end }}
-    chmod +x {{ $prefix }}*.sh
+{{- $global := index . 0 -}}
+set -e
+{{- range $i, $prefix := index . 1 -}}
+  {{- range $path, $content := $global.Files.Glob "scripts/*.sh" }}
+    {{- $name := trimPrefix "scripts/" $path }}
+echo "/scripts/{{ $name }}"
+    {{- if or ( hasPrefix $prefix $name ) ( hasPrefix "common" $name ) }}
+printf '%s' "{{ $content | toString | b64enc }}" |base64 -d >"/scripts/{{ $name }}"
     {{- end }}
   {{- end }}
-  volumeMounts:
-    - name: scripts-dir
-      mountPath: /scripts
+ls /scripts/{{ $prefix }}*.sh;
+chmod +x /scripts/{{ $prefix }}*.sh;
+{{- end }}
+
+{{- range $i, $script := index . 2 -}}
+echo "Running Script {{ $script }}";
+  {{ $script }};
+{{- end }}
 {{- end -}}
-
-
-
-
-
diff --git a/templates/task-opc.yaml b/templates/task-opc.yaml
@@ -41,15 +41,13 @@ spec:
 {{- include "environment" ( list $variables ) | nindent 6 }}
 
   steps:
-{{- include "load_scripts" ( list . "opc-" ) | nindent 4 }}
-
     - name: opc
       image: {{ .Values.images.opc }}
       env:
         - name: HOME
           value: /tekton/home
-      command:
-        - /scripts/opc-client.sh
+      script: |
+{{- include "load_scripts" ( list . ( list "opc-" ) ( list "/scripts/opc-client.sh" ) ) | nindent 8 }}
       args: ["$(params.ARGS)"]
       securityContext:
         runAsNonRoot: true

diff --git a/templates/task-openshift-client.yaml b/templates/task-openshift-client.yaml
@@ -51,15 +51,13 @@ spec:
 {{- include "environment" ( list $variables ) | nindent 6 }}
 
   steps:
-{{- include "load_scripts" ( list . "oc-" ) | nindent 4 }}
-
     - name: oc
       image: {{ .Values.images.openshiftCli }}
       env:
         - name: HOME
           value: /tekton/home
-      command:
-        - /scripts/oc-client.sh
+      script: |
+{{- include "load_scripts" ( list . ( list "oc-" ) ( list "/scripts/oc-client.sh" ) ) | nindent 8 }}
       securityContext:
         runAsNonRoot: true
         runAsUser: 65532

diff --git a/templates/task-tkn.yaml b/templates/task-tkn.yaml
@@ -41,15 +41,13 @@ spec:
 {{- include "environment" ( list $variables ) | nindent 6 }}
 
   steps:
-{{- include "load_scripts" ( list . "tkn-" ) | nindent 4 }}
-
     - name: tkn
       image: {{ .Values.images.tkn }}
       env:
         - name: HOME
           value: /tekton/home
-      command:
-        - /scripts/tkn-client.sh
+      script: |
+{{- include "load_scripts" ( list . ( list "tkn-" ) ( list "/scripts/tkn-client.sh" ) ) | nindent 8 }}
       args: ["$(params.ARGS)"]
       securityContext:
         runAsNonRoot: true