diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3c839a4f..1d31c0ad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -60,7 +60,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} - name: Install Helm-unittest - run: helm plugin install https://github.com/quintush/helm-unittest + run: helm plugin install https://github.com/helm-unittest/helm-unittest - name: CI run: make ci test: diff --git a/Dockerfile.dapper b/Dockerfile.dapper deleted file mode 100644 index 366d5560..00000000 --- a/Dockerfile.dapper +++ /dev/null @@ -1,35 +0,0 @@ -FROM registry.suse.com/bci/golang:1.23 -# Add buildx plugin -COPY --from=docker.io/docker/buildx-bin:0.21.2 /buildx /usr/libexec/docker/cli-plugins/docker-buildx - -ARG DAPPER_HOST_ARCH -ENV ARCH $DAPPER_HOST_ARCH - -RUN zypper -n in git-core curl tar gzip docker wget awk hostname && \ - zypper -n clean -a && \ - rm -rf /tmp/* /var/tmp/* /usr/share/doc/packages/* - -RUN if [ "${ARCH}" == "amd64" ]; then \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.6; \ - fi -RUN curl -sL https://get.helm.sh/helm-v3.9.0-linux-${ARCH}.tar.gz | tar xvzf - -C /usr/local/bin --strip-components=1 -RUN if [ "${ARCH}" != "s390x" ]; then \ - helm plugin install https://github.com/quintush/helm-unittest; \ - fi - - -ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS CROSS_ARCH USE_DOCKER_BUILDX TARGET_ARCH -ENV DAPPER_SOURCE /go/src/github.com/rancher/backup-restore-operator/ -ENV DAPPER_OUTPUT ./bin ./dist -ENV GOCACHE /root/.cache/go-build -ENV GOPATH /go -ENV DAPPER_DOCKER_SOCKET true -ENV DAPPER_RUN_ARGS --privileged -VOLUME /var/lib/rancher/k3s -VOLUME /var/lib/cni -VOLUME /var/log -ENV HOME ${DAPPER_SOURCE} -WORKDIR ${DAPPER_SOURCE} - -ENTRYPOINT ["./scripts/entry"] -CMD ["ci"] diff --git a/tests/go.mod b/tests/go.mod index 7fb79f9f..b9b377b3 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -2,6 +2,8 @@ module github.com/rancher/backup-restore-operator/tests go 1.23.0 +toolchain go1.23.4 + require ( github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 github.com/rancher/hull v0.0.0-20230424152137-627ef5347afd