From 3272152b6d65bd9ca24fe2ddc69dfd029cd19121 Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Tue, 24 May 2022 19:15:45 +0300
Subject: [PATCH] Retire custom qa images

---
 .gitlab/ci/custom.images.yml         | 12 ------------
 Dockerfile.gitlab-qa-alpine-ruby-2.7 | 24 ------------------------
 Dockerfile.gitlab-qa-alpine-ruby-3.0 | 24 ------------------------
 Dockerfile.gitlab-qa-ruby-2.7        | 19 -------------------
 Dockerfile.gitlab-qa-ruby-3.0        | 19 -------------------
 5 files changed, 98 deletions(-)
 delete mode 100644 Dockerfile.gitlab-qa-alpine-ruby-2.7
 delete mode 100644 Dockerfile.gitlab-qa-alpine-ruby-3.0
 delete mode 100644 Dockerfile.gitlab-qa-ruby-2.7
 delete mode 100644 Dockerfile.gitlab-qa-ruby-3.0

diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index 8628e49..e3240df 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -33,18 +33,6 @@ gitlab-charts-build-base-helm-3.7:
 gitlab-helm3.5-kubectl1.17:
   extends: .build_and_deploy
 
-gitlab-qa-ruby-2.7:
-  extends: .build_and_deploy
-
-gitlab-qa-ruby-3.0:
-  extends: .build_and_deploy
-
-gitlab-qa-alpine-ruby-2.7:
-  extends: .build_and_deploy
-
-gitlab-qa-alpine-ruby-3.0:
-  extends: .build_and_deploy
-
 gitlab-puppeteer:
   extends: .build_and_deploy
 
diff --git a/Dockerfile.gitlab-qa-alpine-ruby-2.7 b/Dockerfile.gitlab-qa-alpine-ruby-2.7
deleted file mode 100644
index 91d5abb..0000000
--- a/Dockerfile.gitlab-qa-alpine-ruby-2.7
+++ /dev/null
@@ -1,24 +0,0 @@
-# Used by:
-#  - GitLab CE/EE Review: https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/review.gitlab-ci.yml
-#  - Nightly QA: https://gitlab.com/gitlab-org/quality/nightly/blob/master/.gitlab-ci.yml
-#  - QA Pipeline Common: https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa.yml, https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa-scheduled.yml
-
-FROM ruby:2.7-alpine
-MAINTAINER GitLab Quality Team
-
-WORKDIR /home/qa
-
-ENV DOCKER_VERSION="20.10.2"
-ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
-ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
-ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
-ENV DOCKER_BIN="/usr/local/bin/docker"
-
-# Install dependencies
-RUN apk --no-cache add -U openssl tar gzip bash ca-certificates build-base curl && mkdir -p /opt
-
-RUN wget -q ${DOCKER_URL} && \
-    tar -zxf ${DOCKER_ARCHIVE} && \
-    mv docker/docker ${DOCKER_BIN} && \
-    echo "${DOCKER_CHECKSUM}  ${DOCKER_BIN}" | sha256sum -c - && \
-    rm ${DOCKER_ARCHIVE}
diff --git a/Dockerfile.gitlab-qa-alpine-ruby-3.0 b/Dockerfile.gitlab-qa-alpine-ruby-3.0
deleted file mode 100644
index 4730545..0000000
--- a/Dockerfile.gitlab-qa-alpine-ruby-3.0
+++ /dev/null
@@ -1,24 +0,0 @@
-# Used by:
-#  - GitLab CE/EE Review: https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/review.gitlab-ci.yml
-#  - Nightly QA: https://gitlab.com/gitlab-org/quality/nightly/blob/master/.gitlab-ci.yml
-#  - QA Pipeline Common: https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa.yml, https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa-scheduled.yml
-
-FROM ruby:3.0-alpine
-MAINTAINER GitLab Quality Team
-
-WORKDIR /home/qa
-
-ENV DOCKER_VERSION="20.10.2"
-ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
-ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
-ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
-ENV DOCKER_BIN="/usr/local/bin/docker"
-
-# Install dependencies
-RUN apk --no-cache add -U openssl tar gzip bash ca-certificates build-base curl && mkdir -p /opt
-
-RUN wget -q ${DOCKER_URL} && \
-    tar -zxf ${DOCKER_ARCHIVE} && \
-    mv docker/docker ${DOCKER_BIN} && \
-    echo "${DOCKER_CHECKSUM}  ${DOCKER_BIN}" | sha256sum -c - && \
-    rm ${DOCKER_ARCHIVE}
diff --git a/Dockerfile.gitlab-qa-ruby-2.7 b/Dockerfile.gitlab-qa-ruby-2.7
deleted file mode 100644
index 9c5293a..0000000
--- a/Dockerfile.gitlab-qa-ruby-2.7
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM ruby:2.7
-
-
-# Enable support for UTF encoded stdin/stdout
-ENV LANG C.UTF-8
-
-WORKDIR /home/qa
-
-ENV DOCKER_VERSION="20.10.2"
-ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
-ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
-ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
-ENV DOCKER_BIN="/usr/local/bin/docker"
-
-RUN wget -q ${DOCKER_URL} && \
-    tar -zxf ${DOCKER_ARCHIVE} && \
-    mv docker/docker ${DOCKER_BIN} && \
-    echo "${DOCKER_CHECKSUM}  ${DOCKER_BIN}" | sha256sum -c - && \
-    rm ${DOCKER_ARCHIVE}
diff --git a/Dockerfile.gitlab-qa-ruby-3.0 b/Dockerfile.gitlab-qa-ruby-3.0
deleted file mode 100644
index 39340f1..0000000
--- a/Dockerfile.gitlab-qa-ruby-3.0
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM ruby:3.0
-
-
-# Enable support for UTF encoded stdin/stdout
-ENV LANG C.UTF-8
-
-WORKDIR /home/qa
-
-ENV DOCKER_VERSION="20.10.2"
-ENV DOCKER_ARCHIVE="docker-${DOCKER_VERSION}.tgz"
-ENV DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_ARCHIVE}"
-ENV DOCKER_CHECKSUM="893e0b05e347dee1d857022181831c6ec3798e9a49fda9a319b2f5a6fb79c42d"
-ENV DOCKER_BIN="/usr/local/bin/docker"
-
-RUN wget -q ${DOCKER_URL} && \
-    tar -zxf ${DOCKER_ARCHIVE} && \
-    mv docker/docker ${DOCKER_BIN} && \
-    echo "${DOCKER_CHECKSUM}  ${DOCKER_BIN}" | sha256sum -c - && \
-    rm ${DOCKER_ARCHIVE}