Skip to content

Commit 169cdde

Browse files
committed
chore: referencing the setup-kind script in the plumbing repo instead of copying it
Signed-off-by: Shubham Bhardwaj <[email protected]>
1 parent 8add496 commit 169cdde

File tree

2 files changed

+56
-378
lines changed

2 files changed

+56
-378
lines changed

.github/workflows/e2e-matrix.yml

Lines changed: 56 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -18,68 +18,74 @@ jobs:
1818
fail-fast: false # Keep running if one leg fails.
1919
matrix:
2020
k8s-name:
21-
- k8s-oldest
22-
- k8s-plus-one
21+
- k8s-oldest
22+
- k8s-plus-one
2323

2424
include:
25-
- k8s-name: k8s-oldest
26-
k8s-version: v1.28.x
27-
- k8s-name: k8s-plus-one
28-
k8s-version: v1.29.x
25+
- k8s-name: k8s-oldest
26+
k8s-version: v1.28.x
27+
- k8s-name: k8s-plus-one
28+
k8s-version: v1.29.x
2929
env:
3030
KO_DOCKER_REPO: registry.local:5000/tekton
3131
CLUSTER_DOMAIN: c${{ github.run_id }}.local
3232
ARTIFACTS: ${{ github.workspace }}/artifacts
3333

3434
steps:
35-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
36-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
37-
with:
38-
go-version-file: "go.mod"
39-
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
35+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
36+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
37+
with:
38+
go-version-file: "go.mod"
39+
- uses: ko-build/setup-ko@d006021bd0c28d1ce33a07e7943d48b079944c8d # v0.9
4040

41-
- name: Install Dependencies
42-
working-directory: ./
43-
run: |
44-
echo '::group:: install go-junit-report'
45-
go install github.com/jstemmer/[email protected]
46-
echo '::endgroup::'
41+
- name: Install Dependencies
42+
working-directory: ./
43+
run: |
44+
echo '::group:: install go-junit-report'
45+
go install github.com/jstemmer/[email protected]
46+
echo '::endgroup::'
47+
echo '::group:: created required folders'
48+
mkdir -p "${ARTIFACTS}"
49+
echo '::endgroup::'
50+
echo "${GOPATH}/bin" >> "$GITHUB_PATH"
4751
48-
echo '::group:: created required folders'
49-
mkdir -p "${ARTIFACTS}"
50-
echo '::endgroup::'
52+
- name: Run tests
53+
run: |
54+
curl -sSfL https://raw.githubusercontent.com/tektoncd/plumbing/main/tekton/images/kind-e2e/setup-kind.sh -o setup-kind.sh
55+
chmod +x setup-kind.sh
5156
52-
echo "${GOPATH}/bin" >> "$GITHUB_PATH"
57+
# Patch outdated MetalLB version (v0.9.3 -> v0.13.10)
58+
# v0.9.3 uses PodSecurityPolicy which was removed in Kubernetes 1.25+
59+
sed -i.bak 's|kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.9.3/manifests/namespace.yaml|kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml|g' setup-kind.sh
60+
sed -i.bak '/kubectl apply -f.*metallb\/v0.9.3.*metallb.yaml/d' setup-kind.sh
5361
54-
- name: Run tests
55-
run: |
56-
./hack/setup-kind.sh \
57-
--registry-url $(echo ${KO_DOCKER_REPO} | cut -d'/' -f 1) \
58-
--cluster-suffix c${{ github.run_id }}.local \
59-
--nodes 3 \
60-
--k8s-version ${{ matrix.k8s-version }} \
61-
--e2e-script ./test/e2e-tests.sh \
62-
--e2e-env ./test/e2e-tests-kind-prow.env
62+
./setup-kind.sh \
63+
--registry-url $(echo ${KO_DOCKER_REPO} | cut -d'/' -f 1) \
64+
--cluster-suffix c${{ github.run_id }}.local \
65+
--nodes 3 \
66+
--k8s-version ${{ matrix.k8s-version }} \
67+
--e2e-script ./test/e2e-tests.sh \
68+
--e2e-env ./test/e2e-tests-kind-prow.env
6369
64-
- name: Upload test results
65-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
66-
with:
67-
name: ${{ matrix.k8s-version }}-${{ matrix.feature-flags }}
68-
path: ${{ env.ARTIFACTS }}
70+
- name: Upload test results
71+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
72+
with:
73+
name: ${{ matrix.k8s-version }}-${{ matrix.feature-flags }}
74+
path: ${{ env.ARTIFACTS }}
6975

70-
- uses: chainguard-dev/actions/kind-diag@6f4f4de7549514e7b659741b30f6476f245600dd # v1.5.3
71-
if: ${{ failure() }}
72-
with:
73-
artifact-name: ${{ matrix.k8s-version }}-${{ matrix.feature-flags }}-logs
76+
- uses: chainguard-dev/actions/kind-diag@6f4f4de7549514e7b659741b30f6476f245600dd # v1.5.3
77+
if: ${{ failure() }}
78+
with:
79+
artifact-name: ${{ matrix.k8s-version }}-${{ matrix.feature-flags }}-logs
7480

75-
- name: Dump Artifacts
76-
if: ${{ failure() }}
77-
run: |
78-
if [[ -d ${{ env.ARTIFACTS }} ]]; then
79-
cd ${{ env.ARTIFACTS }}
80-
for x in $(find . -type f); do
81-
echo "::group:: artifact $x"
82-
cat $x
83-
echo '::endgroup::'
84-
done
85-
fi
81+
- name: Dump Artifacts
82+
if: ${{ failure() }}
83+
run: |
84+
if [[ -d ${{ env.ARTIFACTS }} ]]; then
85+
cd ${{ env.ARTIFACTS }}
86+
for x in $(find . -type f); do
87+
echo "::group:: artifact $x"
88+
cat $x
89+
echo '::endgroup::'
90+
done
91+
fi

0 commit comments

Comments
 (0)