[CI] Simplify config setup

Author: Mordil

.gitlab/ci/amazonlinux-2.yml

@@ -1,22 +1,30 @@
-include: '/.gitlab/ci/test-template.yml'
+include: '/.gitlab/ci/platform-test.yml'
 
-.centos7-test-workaround:
-  extends: .unit-test
+variables:
+  SWIFT_STANDARD_PLATFORM_TESTS: "false"
+
+.centos7:
+  extends: .platform-test
   before_script:
     - yum install -y make libcurl-devel
     - git clone https://github.com/git/git -bv2.28.0 --depth 1
     - cd git
     - make prefix=/usr -j all install NO_OPENSSL=1 NO_EXPAT=1 NO_TCLTK=1 NO_GETTEXT=1 NO_PERL=1
 
 swift trunk:
-  extends: .centos7-test-workaround
+  extends: .centos7
   image: swiftlang/swift:nightly-master-centos7
   allow_failure: true
 
+# 5.4 nightlies are not available yet
+# swift 5.4:
+#   extends: .centos7
+#   image: swiftlang/swift:nightly-5.4-centos7
+
 swift 5.3:
-  extends: .centos7-test-workaround
+  extends: .centos7
   image: swift:5.3-centos7
 
 swift 5.2:
-  extends: .centos7-test-workaround
+  extends: .centos7
   image: swift:5.2-centos7

.gitlab/ci/centos-7.yml

@@ -58,38 +58,38 @@ Code Climate:
     reports:
       codequality: gl-code-quality-report.json
 
-Ubuntu Bionic:
+.platform-test:
   stage: Platform Tests
   trigger:
     strategy: depend
-    include: '/.gitlab/ci/ubuntu-bionic.yml'
+    include: '/.gitlab/ci/platform-test.yml'
+
+Ubuntu Bionic:
+  extends: .platform-test
+  variables:
+    SWIFT_PLATFORM_NAME: bionic
 
 Ubuntu Xenial:
-  stage: Platform Tests
-  trigger:
-    strategy: depend
-    include: '/.gitlab/ci/ubuntu-xenial.yml'
+  extends: .platform-test
+  variables:
+    SWIFT_PLATFORM_NAME: xenial
 
 Ubuntu Focal:
-  stage: Platform Tests
-  trigger:
-    strategy: depend
-    include: '/.gitlab/ci/ubuntu-focal.yml'
+  extends: .platform-test
+  variables:
+    SWIFT_PLATFORM_NAME: focal
 
 CentOS 7:
-  stage: Platform Tests
+  extends: .platform-test
   trigger:
-    strategy: depend
     include: '/.gitlab/ci/centos-7.yml'
 
 CentOS 8:
-  stage: Platform Tests
-  trigger:
-    strategy: depend
-    include: '/.gitlab/ci/centos-8.yml'
+  extends: .platform-test
+  variables:
+    SWIFT_PLATFORM_NAME: centos8
 
 Amazon Linux 2:
-  stage: Platform Tests
-  trigger:
-    strategy: depend
-    include: '/.gitlab/ci/amazonlinux-2.yml'
+  extends: .platform-test
+  variables:
+    SWIFT_PLATFORM_NAME: amazonlinux2

.gitlab/ci/centos-8.yml

@@ -0,0 +1,43 @@
+stages:
+  - Test
+
+variables:
+  SWIFT_STANDARD_PLATFORM_TESTS: "true"
+
+.platform-test:
+  stage: Test
+  tags:
+    - docker
+  variables:
+    REDIS_URL: 'redis'
+    REDIS_PW: 'password'
+  services:
+  - name: redis:5
+    alias: 'redis'
+    command: ["redis-server", "--requirepass", "password"]
+  script:
+    - swift build --build-tests --enable-test-discovery --sanitize=thread -v 
+    - swift test --skip-build
+
+.standard-platform:
+  extends: .platform-test
+  rules:
+    - if: '$SWIFT_STANDARD_PLATFORM_TESTS == "true"'
+
+swift trunk:
+  extends: .standard-platform
+  image: swiftlang/swift:nightly-master-${SWIFT_PLATFORM_NAME}
+  allow_failure: true
+
+# 5.4 nightlies are not available yet
+# swift 5.4:
+#   extends: .standard-platform
+#   image: swiftlang/swift:nightly-5.4-${SWIFT_PLATFORM_NAME}
+
+swift 5.3:
+  extends: .standard-platform
+  image: swift:5.3-${SWIFT_PLATFORM_NAME}
+
+swift 5.2:
+  extends: .standard-platform
+  image: swift:5.2-${SWIFT_PLATFORM_NAME}