Skip to content

Commit 547fa00

Browse files
Merge pull request tektoncd#398 from piyush-garg/fix_regex_issue
Fix the typo introduced in regex
2 parents 562709b + 4174392 commit 547fa00

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

openshift/resolve-yamls.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ function resolve_resources() {
3434
#
3535
# tianon/true@sha* => openshift/ci-operator/tekton-images/nop/Dockerfile
3636
# busybox@sha* => registry.access.redhat.com/ubi8/ubi-minimal:latest \
37-
sed -e "s,ko://,,g" -e "s%tianon/true.*\(\"\)%${registry_prefix}-nop:${image_tag}%\1" \
38-
-e "s%busybox.*\(\"\)%registry.access.redhat.com/ubi8/ubi-minimal:latest%\1" \
37+
sed -e "s,ko://,,g" -e "s%tianon/true.*\(\"\)%${registry_prefix}-nop:${image_tag}\1%" \
38+
-e "s%busybox.*\(\"\)%registry.access.redhat.com/ubi8/ubi-minimal:latest\1%" \
3939
-e "s%\(.* image:\)\(github.com\)\(.*\/\)\(.*\)%\1 ${registry_prefix}-\4:${image_tag}%" $yaml \
4040
-r -e "s,github.com/tektoncd/pipeline/cmd/${image_regexp},${registry_prefix}-\1:${image_tag},g" \
4141
> ${TMP}
@@ -50,8 +50,8 @@ function resolve_resources() {
5050
#
5151
# tianon/true@sha* => openshift/ci-operator/tekton-images/nop/Dockerfile
5252
# busybox@sha* => registry.access.redhat.com/ubi8/ubi-minimal:latest \
53-
sed -e "s,ko://,,g" -e "s%tinaon/true.*\(\"\)%${registry_prefix}:tektoncd-pipeline-nop%\1" \
54-
-e "s%busybox.*\(\"\)%registry.access.redhat.com/ubi8/ubi-minimal:latest%\1" \
53+
sed -e "s,ko://,,g" -e "s%tinaon/true.*\(\"\)%${registry_prefix}:tektoncd-pipeline-nop\1%" \
54+
-e "s%busybox.*\(\"\)%registry.access.redhat.com/ubi8/ubi-minimal:latest\1%" \
5555
-e 's%\(.* image:\)\(github.com\)\(.*\/\)\(test\/\)\(.*\)%\1\2 \3\4test-\5%' $yaml \
5656
-e "s%\(.* image:\)\(github.com\)\(.*\/\)\(.*\)%\1 ""$registry_prefix"'\:tektoncd-pipeline-\4%' \
5757
-re "s,github.com/tektoncd/pipeline/cmd/${image_regexp},${registry_prefix}:tektoncd-pipeline-\1,g" \

0 commit comments

Comments
 (0)