From 1049368fc74c8647ad20a87ce16c6f61d4b6e4f6 Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Wed, 23 Mar 2022 14:55:33 +0100
Subject: [PATCH] Maintenance: Refactor handling of ES versions in CI.

---
 .gitlab/ci/base.yml           | 11 +----------
 .gitlab/ci/integration/es.yml | 14 ++++++++------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitlab/ci/base.yml b/.gitlab/ci/base.yml
index 87f150962..2491d4d59 100644
--- a/.gitlab/ci/base.yml
+++ b/.gitlab/ci/base.yml
@@ -12,6 +12,7 @@
   variables:
     ES_INDEX_RAND: "true"
     ES_URL: "http://elasticsearch:9200"
+    ELASTICSEARCH_TAG: '7.16'
 
 .variables_redis_memcached: &variables_redis_memcached
   variables:
@@ -168,8 +169,6 @@
     - <<: *docker_imap
 
 .services_mysql_postgresql_elasticsearch: &services_mysql_postgresql_elasticsearch
-  variables:
-    ELASTICSEARCH_TAG: 'stable'
   services:
     - <<: *docker_mysql
     - <<: *docker_postgresql
@@ -178,8 +177,6 @@
 .services_mysql_postgresql_elasticsearch_selenium_chrome_imap: &services_mysql_postgresql_elasticsearch_selenium_chrome_imap
   extends:
     - .variables_selenium_chrome
-  variables:
-    ELASTICSEARCH_TAG: 'stable'
   services:
     - <<: *docker_mysql
     - <<: *docker_postgresql
@@ -190,8 +187,6 @@
 .services_mysql_postgresql_elasticsearch_selenium_firefox_imap: &services_mysql_postgresql_elasticsearch_selenium_firefox_imap
   extends:
     - .variables_selenium_firefox
-  variables:
-    ELASTICSEARCH_TAG: 'stable'
   services:
     - <<: *docker_mysql
     - <<: *docker_postgresql
@@ -203,8 +198,6 @@
   extends:
     - .variables_selenium_chrome
     - .variables_redis_memcached
-  variables:
-    ELASTICSEARCH_TAG: 'stable'
   services:
     - <<: *docker_mysql
     - <<: *docker_postgresql
@@ -218,8 +211,6 @@
   extends:
     - .variables_selenium_firefox
     - .variables_redis_memcached
-  variables:
-    ELASTICSEARCH_TAG: 'stable'
   services:
     - <<: *docker_mysql
     - <<: *docker_postgresql
diff --git a/.gitlab/ci/integration/es.yml b/.gitlab/ci/integration/es.yml
index dd0f72132..c328c7669 100644
--- a/.gitlab/ci/integration/es.yml
+++ b/.gitlab/ci/integration/es.yml
@@ -14,14 +14,16 @@
     - bundle exec rails test test/integration/elasticsearch_test.rb
     - bundle exec rspec --tag searchindex --tag ~type:system --profile 10
 
-"rspec:es:7":
-  <<: *template_integration_es
-  variables:
-    ELASTICSEARCH_TAG: '7'
-    RAILS_ENV: "test"
-
+# Lowest supported version
 "rspec:es:7.8":
   <<: *template_integration_es
   variables:
     ELASTICSEARCH_TAG: '7.8.1'
     RAILS_ENV: "test"
+
+# Highest supported version (except for newer releases that are not yet in CI)
+"rspec:es:7.16":
+  <<: *template_integration_es
+  variables:
+    ELASTICSEARCH_TAG: '7.16'
+    RAILS_ENV: "test"