From 4d3ccc947b59ebc6a23bf0f91483c82342cc7c7b Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Fri, 28 Jun 2024 10:04:47 -0700
Subject: [PATCH] Simplify and update E2E drone pipeline

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .drone.yml        |  5 +++--
 Dockerfile.dapper |  2 +-
 Dockerfile.local  | 10 ++++------
 Dockerfile.test   |  6 ++----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 447d09358e81..b7383264ba78 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -593,10 +593,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
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index ce604819e7c3..9f48b79fc460 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -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
diff --git a/Dockerfile.local b/Dockerfile.local
index ba985ef1da02..140ca9c98974 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,4 +1,4 @@
-ARG GOLANG=golang:1.22.6-alpine3.19
+ARG GOLANG=golang:1.22.6-alpine3.20
 FROM ${GOLANG} as infra
 
 ARG http_proxy=$http_proxy
@@ -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 \
diff --git a/Dockerfile.test b/Dockerfile.test
index 2f9b0676894b..3592c62033b9 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -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
 
@@ -44,7 +42,7 @@ RUN vagrant box add bento/ubuntu-24.04 --provider libvirt --force
 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.21.5; \
+RUN GO_VERSION=go1.22.2; \
     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;