From 77e109433958ca48f31096fa8f17c5cbc098b5cf Mon Sep 17 00:00:00 2001
From: Jihu Release Tools Bot <jihu-release-tools-bot@gitlab.cn>
Date: Wed, 8 Dec 2021 09:50:47 +0000
Subject: [PATCH] Update component versions

---
 ci_files/variables.yml | 68 ++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/ci_files/variables.yml b/ci_files/variables.yml
index a45a2ace0..c70a94318 100644
--- a/ci_files/variables.yml
+++ b/ci_files/variables.yml
@@ -1,39 +1,35 @@
+---
 variables:
-  GITLAB_ELASTICSEARCH_INDEXER_VERSION: "main"
-  GITLAB_VERSION: "main-jh"
-  GITLAB_REF_SLUG: "main-jh"
-  GITLAB_ASSETS_TAG: "main-jh"
-  GITLAB_EXPORTER_VERSION: "11.2.0"
-  GITLAB_SHELL_VERSION: "main"
-  GITLAB_CONTAINER_REGISTRY_VERSION: "v3.17.0-gitlab"
-  GITALY_SERVER_VERSION: "master"
-  GITLAB_PAGES_VERSION: "master"
-  GIT_VERSION: "2.29.0"
-  GO_VERSION: "1.16.9"
-  KUBECTL_VERSION: "1.16.15"
-  PG_VERSION: "13.2"
-  MAILROOM_VERSION: "0.0.14"
-  ALPINE_VERSION: "3.10"
-  CFSSL_VERSION: "1.2"
+  GITLAB_ELASTICSEARCH_INDEXER_VERSION: v2.16.0
+  GITLAB_VERSION: f7eb784083dc01f0f557f642f899d4d661cf7f81
+  GITLAB_REF_SLUG: main-jh
+  GITLAB_ASSETS_TAG: f7eb784083dc01f0f557f642f899d4d661cf7f81
+  GITLAB_EXPORTER_VERSION: 11.2.0
+  GITLAB_SHELL_VERSION: v13.22.1
+  GITLAB_CONTAINER_REGISTRY_VERSION: v3.17.0-gitlab
+  GITALY_SERVER_VERSION: 7034511c6f456177e023d7b418ceaa391deee79a
+  GITLAB_PAGES_VERSION: v1.48.0
+  GIT_VERSION: 2.29.0
+  GO_VERSION: 1.16.9
+  KUBECTL_VERSION: 1.16.15
+  PG_VERSION: '13.2'
+  MAILROOM_VERSION: 0.0.9
+  ALPINE_VERSION: '3.10'
+  CFSSL_VERSION: '1.2'
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375
-  DOCKER_TLS_CERTDIR: ""
-  ASSETS_IMAGE_PREFIX: "gitlab-assets"
-  ASSETS_IMAGE_REGISTRY_PREFIX: "registry.gitlab.com/gitlab-org"
-  GITLAB_NAMESPACE: "gitlab-org"
-  CE_PROJECT: "gitlab-foss"
-  EE_PROJECT: "gitlab"
-  COMPILE_ASSETS: "false"
-  AWSCLI_VERSION: "1.20.56"
-  S3CMD_VERSION: "2.2.0"
-  PYTHON_VERSION: "3.8.9"
-  GM_VERSION: "1.3.36"
-  GITLAB_LOGGER_VERSION: "v1.3.1"
-  GITLAB_LOGGER_SHA256: "1f53389f9efe306d0b98faa7b75c312965baf46831f3d21b94b4e5d7cd133329"
-  GOMPLATE_VERSION: "v3.9.0"
-  GOMPLATE_SHA256: "7dbabe30095f822ec38f5f70711ff121c26e588227da4cc05208417cfaf929cd"
-
-## Note
-# Variables ASSETS_IMAGE_REGISTRY_PREFIX, GITLAB_NAMESPACE and CE_PROJECT are
-# overridden in the mirror of this project in dev.gitlab.org to match their dev
-# counterpart locations.
+  DOCKER_TLS_CERTDIR: ''
+  ASSETS_IMAGE_PREFIX: gitlab-assets
+  ASSETS_IMAGE_REGISTRY_PREFIX: registry.gitlab.com/gitlab-org
+  GITLAB_NAMESPACE: gitlab-org
+  CE_PROJECT: gitlab-foss
+  EE_PROJECT: gitlab
+  COMPILE_ASSETS: 'false'
+  AWSCLI_VERSION: 1.20.56
+  S3CMD_VERSION: 2.2.0
+  PYTHON_VERSION: 3.8.9
+  GM_VERSION: 1.3.36
+  GITLAB_LOGGER_VERSION: v1.3.1
+  GITLAB_LOGGER_SHA256: 1f53389f9efe306d0b98faa7b75c312965baf46831f3d21b94b4e5d7cd133329
+  GOMPLATE_VERSION: v3.9.0
+  GOMPLATE_SHA256: 7dbabe30095f822ec38f5f70711ff121c26e588227da4cc05208417cfaf929cd
-- 
GitLab