From ee508fa7a42a6c39cfff9ed3eb1cf0a8f2f15ed7 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 16 Mar 2021 08:20:57 +0100 Subject: [PATCH 1/4] ci: Drop builds with git v2.28.0 The minimum required version of git has been bumped to v2.29.0 some time ago. It's thus not necessary anymore to build images for git v2.28.0. Drop them. --- .gitlab-ci.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9b4fd4..c34650f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,29 +76,21 @@ variables: # Tests # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml -ruby-2.7-golang-1.14-git-2.28 test: *test_custom -ruby-2.7-golang-1.15-git-2.28 test: *test_custom -ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom ruby-2.7-golang-1.14-git-2.29 test: *test_custom ruby-2.7-golang-1.15-git-2.29 test: *test_custom ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 test: *test_custom # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml -ruby-2.7.2.patched-golang-1.14-git-2.28-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom -ruby-2.7.2.patched-golang-1.14-git-2.28-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom # Used by GitLab's compile-production-assets and compile-test-assets jobs -ruby-2.7.2-git-2.28-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom ruby-3.0.0-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml -ruby-2.6.5-git-2.28-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom -ruby-2.6.5-git-2.28-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom ruby-2.6.5-git-2.29-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom @@ -145,29 +137,21 @@ gitlab-operator-build-base test: *test_build # Builds # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml -ruby-2.7-golang-1.14-git-2.28 push: *build_and_deploy_custom -ruby-2.7-golang-1.15-git-2.28 push: *build_and_deploy_custom -ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14 push: *build_and_deploy_custom ruby-2.7-golang-1.14-git-2.29 push: *build_and_deploy_custom ruby-2.7-golang-1.15-git-2.29 push: *build_and_deploy_custom ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 push: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.7.2.patched-golang-1.14-git-2.28-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom -ruby-2.7.2.patched-golang-1.14-git-2.28-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom # Used by GitLab's compile-production-assets and compile-test-assets jobs -ruby-2.7.2-git-2.28-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-3.0.0-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml -ruby-2.6.5-git-2.28-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom -ruby-2.6.5-git-2.28-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom ruby-2.6.5-git-2.29-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom From cfdf21780842efd11040fae9fbaf98311f759d80 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 16 Mar 2021 08:40:21 +0100 Subject: [PATCH 2/4] ci: Upgrade customers-gitlab-com image to use git v2.31 One of the images we build is still using git v2.26.0. Upgrade it to use git v2.31.0 such that we can drop all git versions before v2.29.0 at a later point. Downstream will be upgraded accordingly after the updated build image has landed. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c34650f..68e899e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_cu ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom # Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml -ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36: *test_custom +ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36: *test_custom danger test: *test_build alpine-helm test: *test_build @@ -157,7 +157,7 @@ ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_a ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom # Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml -ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36 push: *build_and_deploy_custom danger push: *build_and_deploy alpine-helm push: *build_and_deploy From 368176b2e71caafd8d19a690da49094e7796a342 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 16 Mar 2021 08:32:35 +0100 Subject: [PATCH 3/4] scripts: Drop old versions of git The minimum required version of git nowadays is v2.29.0, and thus we don't create images with versions older than that anymore. We can thus safely drop their hashes from the custom-docker-build script. --- scripts/custom-docker-build | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 12245d7..4e146cf 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -73,38 +73,6 @@ function print_chrome_args() { # see https://www.kernel.org/pub/software/scm/git function print_git_args() { case "$1" in - 2.18) - GIT_VERSION=2.18.0 - GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4 - ;; - 2.21) - GIT_VERSION=2.21.0 - GIT_DOWNLOAD_SHA256=85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee - ;; - 2.22) - GIT_VERSION=2.22.0 - GIT_DOWNLOAD_SHA256=a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b - ;; - 2.24) - GIT_VERSION=2.24.3 - GIT_DOWNLOAD_SHA256=ef6d1d1de1d7921a54d23d07479bd2766f050d6435cea5d3b5322aa4897cb3d7 - ;; - 2.25) - GIT_VERSION=2.25.4 - GIT_DOWNLOAD_SHA256=1b11d0ee481c6735e9f7d81a3576ef0989bde7843cb4adcdef578c0593d279ab - ;; - 2.26) - GIT_VERSION=2.26.2 - GIT_DOWNLOAD_SHA256=e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121 - ;; - 2.27) - GIT_VERSION=2.27.0 - GIT_DOWNLOAD_SHA256=77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787 - ;; - 2.28) - GIT_VERSION=2.28.0 - GIT_DOWNLOAD_SHA256=f914c60a874d466c1e18467c864a910dd4ea22281ba6d4d58077cb0c3f115170 - ;; 2.29) GIT_VERSION=2.29.0 GIT_DOWNLOAD_SHA256=fa08dc8424ef80c0f9bf307877f9e2e49f1a6049e873530d6747c2be770742ff From 3272fc25ccff2d424152cab9aec0a2020ba0c6ab Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 16 Mar 2021 08:22:52 +0100 Subject: [PATCH 4/4] ci: Start building images for git v2.31.0 We're going to switch over to git v2.31.0 soonish. As a preparatory step, this commit adds a bunch of jobs to start building images with this version. --- .gitlab-ci.yml | 24 ++++++++++++++++++++++++ scripts/custom-docker-build | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68e899e..e1f0d83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,21 +79,33 @@ variables: ruby-2.7-golang-1.14-git-2.29 test: *test_custom ruby-2.7-golang-1.15-git-2.29 test: *test_custom ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 test: *test_custom +ruby-2.7-golang-1.14-git-2.31 test: *test_custom +ruby-2.7-golang-1.15-git-2.31 test: *test_custom +ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom +ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom +ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom +ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom +ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 test: *test_custom # Used by GitLab's compile-production-assets and compile-test-assets jobs ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom ruby-3.0.0-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom +ruby-2.7.2-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom +ruby-3.0.0-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.6.5-git-2.29-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom +ruby-2.6.5-git-2.31-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom +ruby-2.6.5-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom +ruby-2.7.2-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 test: *test_custom # Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36: *test_custom @@ -140,21 +152,33 @@ gitlab-operator-build-base test: *test_build ruby-2.7-golang-1.14-git-2.29 push: *build_and_deploy_custom ruby-2.7-golang-1.15-git-2.29 push: *build_and_deploy_custom ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 push: *build_and_deploy_custom +ruby-2.7-golang-1.14-git-2.31 push: *build_and_deploy_custom +ruby-2.7-golang-1.15-git-2.31 push: *build_and_deploy_custom +ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-2.7.2.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-3.0.0.patched-golang-1.14-git-2.29-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-3.0.0.patched-golang-1.14-git-2.31-lfs-2.9-chrome-87-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36 push: *build_and_deploy_custom # Used by GitLab's compile-production-assets and compile-test-assets jobs ruby-2.7.2-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-3.0.0-git-2.29-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-2.7.2-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom +ruby-3.0.0-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.6.5-git-2.29-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom ruby-2.6.5-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom +ruby-2.6.5-git-2.31-chrome-74.0-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom +ruby-2.6.5-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom +ruby-2.7.2-git-2.31-chrome-85-node-12.18-yarn-1.22-docker-19.03.1 push: *build_and_deploy_custom # Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36 push: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 4e146cf..6c2990a 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -77,6 +77,10 @@ function print_git_args() { GIT_VERSION=2.29.0 GIT_DOWNLOAD_SHA256=fa08dc8424ef80c0f9bf307877f9e2e49f1a6049e873530d6747c2be770742ff ;; + 2.31) + GIT_VERSION=2.31.0 + GIT_DOWNLOAD_SHA256=bc6168777883562569144d536e8a855b12d25d46870d95188a3064260d7784ee + ;; *) echo "Unknown git version $1"; exit 1; esac