File tree Expand file tree Collapse file tree 6 files changed +57
-15
lines changed Expand file tree Collapse file tree 6 files changed +57
-15
lines changed Original file line number Diff line number Diff line change @@ -12,29 +12,25 @@ TOOLS_BIN=${ROOT_DIR}/build/tools/bin
12
12
UNAME_S=$( uname -s)
13
13
UNAME_M=$( uname -m)
14
14
15
- rm -rf oc-tmp
16
- mkdir oc-tmp
17
-
18
15
if [ " Darwin" = " ${UNAME_S} " ]; then
19
16
if [ " x86_64" = " ${UNAME_M} " ]; then
20
17
echo " Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M} "
21
- curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-mac.tar.gz -o oc-tmp/ openshift-client.tar.gz
18
+ curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-mac.tar.gz -o openshift-client.tar.gz
22
19
else
23
20
echo " Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M} "
24
- curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-mac-arm64.tar.gz -o oc-tmp/ openshift-client.tar.gz
21
+ curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-mac-arm64.tar.gz -o openshift-client.tar.gz
25
22
fi
26
23
else
27
24
if [ " x86_64" = " ${UNAME_M} " ]; then
28
25
echo " Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M} "
29
- curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o oc-tmp/ openshift-client.tar.gz
26
+ curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client.tar.gz
30
27
else
31
28
echo " Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M} "
32
- curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-linux.tar.gz -o oc-tmp/ openshift-client.tar.gz
29
+ curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client.tar.gz
33
30
fi
34
31
fi
35
32
36
- cd oc-tmp && tar -xvf openshift-client.tar.gz
37
- mv oc-tmp/oc ${TOOLS_BIN} /oc
38
- rm -rf oc-tmp
39
-
33
+ tar -zxvf openshift-client.tar.gz oc
34
+ mv oc ${TOOLS_BIN} /oc
40
35
chmod +x ${TOOLS_BIN} /oc
36
+ rm openshift-client.tar.gz
Original file line number Diff line number Diff line change @@ -13,7 +13,10 @@ TOOLS_BIN=${ROOT_DIR}/build/tools/bin
13
13
UNAME_S=$( uname -s)
14
14
UNAME_M=$( uname -m)
15
15
16
- TEKTON_VERSION=$( curl -L -s https://dl.k8s.io/release/stable.txt)
16
+ if [ " ${TEKTON_VERSION} " == " " ]
17
+ then
18
+ TEKTON_VERSION=0.40.0
19
+ fi
17
20
18
21
if [ " Darwin" = " ${UNAME_S} " ]; then
19
22
echo " Downloading Tekton ${VERSION} ${UNAME_S} ${UNAME_M} "
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ RUN dnf install oracle-java-jdk-release-el* -y \
9
9
&& dnf install jdk-21-headful -y \
10
10
&& dnf install make which git -y
11
11
12
- RUN curl -Ls https://go.dev/dl/$GoVersion.linux-$GoArch.tar.gz -o go-linux.tar.gz \
12
+ RUN curl -Ls https://go.dev/dl/go $GoVersion.linux-$GoArch.tar.gz -o go-linux.tar.gz \
13
13
&& rm -rf /usr/local/go \
14
14
&& tar -C /usr/local -xzf go-linux.tar.gz \
15
15
&& rm go-linux.tar.gz \
Original file line number Diff line number Diff line change
1
+ apiVersion : tekton.dev/v1
2
+ kind : PipelineRun
3
+ metadata :
4
+ name : NAME_PLACEHOLDER
5
+ spec :
6
+ pipelineRef :
7
+ name : operator-ci
8
+ workspaces :
9
+ - name : shared-data
10
+ persistentVolumeClaim :
11
+ claimName : operator-ci-pvc
12
+ - name : dockerconfig
13
+ secret :
14
+ secretName : container-auth-json
15
+ - name : git-credentials
16
+ secret :
17
+ secretName : github-ssh-credentials
18
+ taskRunSpecs :
19
+ - pipelineTaskName : git-clone
20
+ podTemplate :
21
+ securityContext :
22
+ fsGroup : 65532
23
+ timeouts :
24
+ pipeline : " 2h3m0s"
25
+ tasks : " 2h0m0s"
26
+ params :
27
+ - name : repo-url
28
+ value : GIT_REPO_PLACEHOLDER
29
+ - name : revision
30
+ value : REVISION_PLACEHOLDER
31
+ - name : builder-image-prefix
32
+ value : " iad.ocir.io/odx-stateservice/tekton/builder"
33
+ - name : env-configmap
34
+ value : os-cert-config
35
+ - name : oci-tenancy-ocid
36
+ value : " ocid1.tenancy.oc1..aaaaaaaaztkccp2ubbxhhuftzvouv6t3b4sfencpgvsicrtmhwprk2mgahjq"
37
+ - name : oci-user-ocid
38
+ value : " ocid1.user.oc1..aaaaaaaa6vuuuw4vx3etfnugb6r34uyy2ovu2hbqivmazxylohc633pflkla"
39
+ - name : oci-region
40
+ value : " us-phoenix-1"
41
+ - name : oci-cli-secret
42
+ value : oci-cli-secret
43
+
Original file line number Diff line number Diff line change 9
9
subjects :
10
10
- kind : ServiceAccount
11
11
name : pipeline
12
- namespace : coherence-cert
12
+ namespace : NAMESPACE_HOLDER
Original file line number Diff line number Diff line change 44
44
BUILD_ARCH=amd64
45
45
fi
46
46
DOCKER_FILE_SHA1SUM=$(sha1sum "${SOURCE_DIRECTORY}/tekton/builder.Dockerfile")
47
- OPERATOR_GO_VERSION=$(sed -n -e 's/^toolchain \(.*\)$/\1/p' $ {SOURCE_DIRECTORY}/go.mod )
47
+ OPERATOR_GO_VERSION=$(cat $ {SOURCE_DIRECTORY}/.go-version )
48
48
readarray -d ' ' -t DOCKER_FILE_SHA <<< "${DOCKER_FILE_SHA1SUM}"
49
49
LATEST_GO=$(curl -s 'https://go.dev/VERSION?m=text' | head -n 1)
50
50
BUILDER_IMAGE_NAME="${PARAM_BUILDER_IMAGE_PREFIX}:${DOCKER_FILE_SHA}-${OPERATOR_GO_VERSION}-${BUILD_ARCH}"
You can’t perform that action at this time.
0 commit comments