public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 23:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify and update E2E drone pipeline (#10430)

Browse Source 
Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola
2025-04-23 10:36:37 -07:00
parent b8f5fad1f6
commit 52a87eacac
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.drone.yml
View File

@@ -512,10 +512,11 @@ steps:
- pull_request
- name: build-e2e-image
image: rancher/dapper:v0.6.0
image: docker:25.0.5
commands:
- DOCKER_BUILDKIT=1 docker build --target test-e2e -t test-e2e -f Dockerfile.test .
- SKIP_VALIDATE=true SKIP_AIRGAP=true GOCOVER=1 dapper ci
- apk add make git bash
- GOCOVER=1 make local
- cp dist/artifacts/* /tmp/artifacts/
volumes:
- name: cache

2
Dockerfile.dapper
View File

@@ -36,7 +36,7 @@ RUN if [ -n "${TRIVY_ARCH}" ]; then \
fi
# Install goimports
RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.11.0
RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.16.0
# Cleanup
RUN rm -rf /go/src /go/pkg

8
Dockerfile.local
View File

@@ -9,7 +9,7 @@ ENV https_proxy=$https_proxy
ENV no_proxy=$no_proxy
RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \
zlib-dev tar zip squashfs-tools npm coreutils python3 py3-pip openssl-dev libffi-dev libseccomp libseccomp-dev \
zlib-dev tar zip squashfs-tools npm coreutils openssl-dev libffi-dev libseccomp libseccomp-dev \
libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static \
zstd pigz alpine-sdk binutils-gold btrfs-progs-dev btrfs-progs-static gawk yq pipx \
&& \
@@ -17,10 +17,8 @@ RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget c
apk -U --no-cache add mingw-w64-gcc; \
fi
RUN PIPX_BIN_DIR=/usr/local/bin pipx install awscli
# this works for both go 1.17 and 1.18
RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.11.0
# Install goimports
RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.16.0
RUN rm -rf /go/src /go/pkg
RUN if [ "$(go env GOARCH)" = "amd64" ]; then \

6
Dockerfile.test
View File

@@ -14,9 +14,7 @@ ENTRYPOINT ["/bin/test-mods"]
FROM test-base AS test-k3s
RUN apk -U --no-cache add git gcc musl-dev docker curl coreutils python3 openssl py3-pip procps findutils yq pipx
RUN PIPX_BIN_DIR=/usr/local/bin pipx install awscli
RUN apk -U --no-cache add git gcc musl-dev docker curl coreutils openssl procps findutils yq
ENV SONOBUOY_VERSION=0.57.2
@@ -52,7 +50,7 @@ RUN cd /.vagrant.d/boxes/bento-VAGRANTSLASH-ubuntu-24.04/ && mv 0 202404.26.0 &&
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"; \
chmod +x ./kubectl; \
mv ./kubectl /usr/local/bin/kubectl
RUN GO_VERSION=go1.22.5; \
RUN GO_VERSION=go1.23.6; \
curl -O -L "https://golang.org/dl/${GO_VERSION}.linux-amd64.tar.gz"; \
rm -rf /usr/local/go; \
tar -C /usr/local -xzf ${GO_VERSION}.linux-amd64.tar.gz;