From ce916fbb38154d51e65c52e12f56465fc9a97f00 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 26 Jul 2024 15:28:10 -0700 Subject: [PATCH] tests: remove Dockerfile The tests/Dockerfile was outdated (using an obsolete Ubuntu distribution), and it's not being used by any workflow or prow job. This Dockerfile was the only one using `scripts/install-marker.sh`, which used a vendorized binary generated by the etcd project. This is not needed anymore, as marker releases now provide the binaries. Signed-off-by: Ivan Valdes --- scripts/install-marker.sh | 21 ---------------- tests/Dockerfile | 50 --------------------------------------- 2 files changed, 71 deletions(-) delete mode 100755 scripts/install-marker.sh delete mode 100644 tests/Dockerfile diff --git a/scripts/install-marker.sh b/scripts/install-marker.sh deleted file mode 100755 index b0f3f984dc9..00000000000 --- a/scripts/install-marker.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -ARCH=${1:-} - -if [ -z "$ARCH" ]; then - echo "Usage: ${0} [amd64 or darwin], defaulting to 'amd64'" >> /dev/stderr - ARCH=amd64 -fi - -MARKER_URL="https://storage.googleapis.com/etcd/test-binaries/marker-v0.4.0-x86_64-unknown-linux-gnu" -if [ "${ARCH}" == "darwin" ]; then - MARKER_URL="https://storage.googleapis.com/etcd/test-binaries/marker-v0.4.0-x86_64-apple-darwin" -fi - -echo "Installing marker" -curl -L "${MARKER_URL}" -o "${GOPATH}"/bin/marker -chmod 755 "${GOPATH}"/bin/marker - -"${GOPATH}"/bin/marker --version diff --git a/tests/Dockerfile b/tests/Dockerfile deleted file mode 100644 index 091398fe356..00000000000 --- a/tests/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM ubuntu:21.10 - -RUN rm /bin/sh && ln -s /bin/bash /bin/sh -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - -RUN apt-get -y update \ - && apt-get -y install \ - build-essential \ - gcc \ - apt-utils \ - pkg-config \ - software-properties-common \ - apt-transport-https \ - libssl-dev \ - sudo \ - bash \ - curl \ - wget \ - tar \ - git \ - netcat \ - libaspell-dev \ - libhunspell-dev \ - hunspell-en-us \ - aspell-en \ - shellcheck \ - && apt-get -y update \ - && apt-get -y upgrade \ - && apt-get -y autoremove \ - && apt-get -y autoclean - -ENV GOROOT /usr/local/go -ENV GOPATH /go -ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION REPLACE_ME_GO_VERSION -ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang -RUN rm -rf ${GOROOT} \ - && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \ - && mkdir -p ${GOPATH}/src ${GOPATH}/bin \ - && go version - -RUN mkdir -p ${GOPATH}/src/go.etcd.io/etcd -WORKDIR ${GOPATH}/src/go.etcd.io/etcd - -ADD ./scripts/install-marker.sh /tmp/install-marker.sh - -RUN /tmp/install-marker.sh amd64 \ - && rm -f /tmp/install-marker.sh \ - && curl -s https://codecov.io/bash >/codecov \ - && chmod 700 /codecov