Skip to content

Commit

Permalink
Fixed usage of SUBDIRECTORY
Browse files Browse the repository at this point in the history
  • Loading branch information
Aneesh-M-Bhat authored and openshift-merge-bot[bot] committed Sep 18, 2024
1 parent 7cbb96b commit be1b817
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/maven-generate.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

declare -rx MAVEN_GENERATE_DIRECTORY="${WORKSPACES_SOURCE_PATH}/maven-generate"
declare -rx MAVEN_GENERATE_DIRECTORY="${WORKSPACES_SOURCE_PATH}/${PARAMS_SUBDIRECTORY}/maven-generate"

declare -rx MAVEN_SETTINGS_FILE="${MAVEN_GENERATE_DIRECTORY}/settings.xml"

Expand Down
1 change: 0 additions & 1 deletion templates/load-scripts.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ set -e
printf '%s' "{{ $content | toString | b64enc }}" |base64 -d >"/scripts/{{ $name }}"
{{- end }}
{{- end }}
ls /scripts/{{ $prefix }}*.sh;
chmod +x /scripts/{{ $prefix }}*.sh;
{{- end }}

Expand Down
5 changes: 4 additions & 1 deletion test/e2e/resources/pipeline-maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ spec:
- name: proxy_configmap
optional: true


params:
- name: URL
type: string
Expand Down Expand Up @@ -48,6 +47,8 @@ spec:
value: "false"
- name: VERBOSE
value: "$(params.VERBOSE)"
- name: SUBDIRECTORY
value: $(context.pipelineRun.name)
- name: maven
taskRef:
name: maven
Expand All @@ -57,6 +58,8 @@ spec:
- name: GOALS
value:
- "validate"
- name: SUBDIRECTORY
value: $(context.pipelineRun.name)
runAfter:
- git-clone
workspaces:
Expand Down

0 comments on commit be1b817

Please sign in to comment.