Skip to content

Commit bd48a14

Browse files
authored
Update Tekton scripts (#795)
1 parent f47bc31 commit bd48a14

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

tekton/install-pipelines.sh

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,27 @@ if [[ "${KUBECTL_CMD}" == "" ]]; then
1515
fi
1616

1717
if [[ "${PIPELINE_NAMESPACE}" != "" ]]; then
18-
NS="--namespace ${PIPELINE_NAMESPACE}"
18+
NS=${PIPELINE_NAMESPACE}
19+
else
20+
NS=default
1921
fi
2022

2123
echo "Installing Tekton resources ${NS}"
22-
tkn task delete ${NS} --force git-clone || true
23-
tkn hub install task ${NS} git-clone
24-
tkn task delete ${NS} --force git-cli || true
25-
tkn hub install task ${NS} git-cli
24+
tkn task delete --namespace ${NS} --force git-clone || true
25+
tkn hub install task --namespace ${NS} git-clone
26+
tkn task delete --namespace ${NS} --force git-cli || true
27+
tkn hub install task --namespace ${NS} git-cli
2628

2729

2830
# Install Operator Tasks
29-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-make.yaml
30-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-setup-env.yaml
31-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-buildah.yaml
32-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-check-image.yaml
33-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-oci-cli.yaml
31+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-make.yaml
32+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-setup-env.yaml
33+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-buildah.yaml
34+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-check-image.yaml
35+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-oci-cli.yaml
3436

3537
# Install Operator Pipelines
36-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/pipeline-operator-ci.yaml
38+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/pipeline-operator-ci.yaml
3739

3840
# Install Operator test configmap
39-
${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/os-cert-config.yaml
41+
${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/os-cert-config.yaml

tekton/operator-ci-run.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,6 @@ spec:
4040
value: "us-phoenix-1"
4141
- name: oci-cli-secret
4242
value: oci-cli-secret
43+
- name: buildah-image
44+
value: 'quay.io/buildah/stable:v1.39.3'
4345

tekton/pipeline-operator-ci.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ spec:
6161
type: string
6262
description: The optional no proxy to use
6363
default: ''
64+
- name: buildah-image
65+
type: string
66+
description: The Buildah image to use
67+
default: 'quay.io/buildah/stable:v1'
6468
results:
6569
- name: upload-result
6670
description: The result of the upload task
@@ -155,6 +159,8 @@ spec:
155159
value: $(tasks.setup-env.results.BUILDER_IMAGE_NAME)
156160
- name: BUILD_EXTRA_ARGS
157161
value: "--build-arg GoArch=$(tasks.setup-env.results.BUILD_ARCH) --build-arg GoVersion=$(tasks.setup-env.results.OPERATOR_GO_VERSION)"
162+
- name: BUILDER_IMAGE
163+
value: $(params.buildah-image)
158164
- name: httpProxy
159165
value: $(params.httpProxy)
160166
- name: httpsProxy

0 commit comments

Comments
 (0)