Separate mariadb/mysql tests

- Now testing different mysql and mariadb versions. - This will actually cause failing tests what we can then fix. - Also grouping pipelines per db types.
spring-cloud · May 30, 2019 · af7bc92 · af7bc92
1 parent 709b6ce
commit af7bc92
Show file tree

Hide file tree

Showing 22 changed files with 803 additions and 21 deletions.
diff --git a/acceptance-tests/ci/pipeline.yml b/acceptance-tests/ci/pipeline.yml
@@ -430,7 +430,7 @@ jobs:
           params:
             file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
 
-- name: acceptance-tests-mysql
+- name: acceptance-tests-mysql-5-6
   serial: true
   public: false
   plan:
@@ -452,9 +452,71 @@ jobs:
       file: git-repo/((base-path))/ci/tasks/build-project.yml
       params:
         BASE_PATH: ((base-path))
-        DATAFLOW_INCLUDE_TAGS: mysql
+        DATAFLOW_INCLUDE_TAGS: mysql_5_6
         REPORT_PATH: ((report-path))
-        REPORT_ID: mysql
+        REPORT_ID: mysql56
+      on_failure:
+        aggregate:
+        - put: acceptance-tests-reports
+          params:
+            file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+- name: acceptance-tests-mysql-5-7
+  serial: true
+  public: false
+  plan:
+  - get: spring-cloud-dataflow-ci-image
+    trigger: true
+    passed:
+      - "spring-cloud-dataflow-ci-images"
+  - get: git-repo
+    trigger: false
+  - get: acceptance-tests-trigger1
+    trigger: true
+    passed:
+      - "build-docker-servers"
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 90m
+      image: spring-cloud-dataflow-ci-image
+      file: git-repo/((base-path))/ci/tasks/build-project.yml
+      params:
+        BASE_PATH: ((base-path))
+        DATAFLOW_INCLUDE_TAGS: mysql_5_7
+        REPORT_PATH: ((report-path))
+        REPORT_ID: mysql57
+      on_failure:
+        aggregate:
+        - put: acceptance-tests-reports
+          params:
+            file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+- name: acceptance-tests-mysql-8-0
+  serial: true
+  public: false
+  plan:
+  - get: spring-cloud-dataflow-ci-image
+    trigger: true
+    passed:
+      - "spring-cloud-dataflow-ci-images"
+  - get: git-repo
+    trigger: false
+  - get: acceptance-tests-trigger1
+    trigger: true
+    passed:
+      - "build-docker-servers"
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 90m
+      image: spring-cloud-dataflow-ci-image
+      file: git-repo/((base-path))/ci/tasks/build-project.yml
+      params:
+        BASE_PATH: ((base-path))
+        DATAFLOW_INCLUDE_TAGS: mysql_8_0
+        REPORT_PATH: ((report-path))
+        REPORT_ID: mysql80
       on_failure:
         aggregate:
         - put: acceptance-tests-reports
@@ -553,3 +615,157 @@ jobs:
         - put: acceptance-tests-reports
           params:
             file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+- name: acceptance-tests-mariadb-10-1
+  serial: true
+  public: false
+  plan:
+  - get: spring-cloud-dataflow-ci-image
+    trigger: true
+    passed:
+      - "spring-cloud-dataflow-ci-images"
+  - get: git-repo
+    trigger: false
+  - get: acceptance-tests-trigger1
+    trigger: true
+    passed:
+      - "build-docker-servers"
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 90m
+      image: spring-cloud-dataflow-ci-image
+      file: git-repo/((base-path))/ci/tasks/build-project.yml
+      params:
+        BASE_PATH: ((base-path))
+        DATAFLOW_INCLUDE_TAGS: mariadb_10_1
+        REPORT_PATH: ((report-path))
+        REPORT_ID: mariadb101
+      on_failure:
+        aggregate:
+        - put: acceptance-tests-reports
+          params:
+            file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+- name: acceptance-tests-mariadb-10-2
+  serial: true
+  public: false
+  plan:
+  - get: spring-cloud-dataflow-ci-image
+    trigger: true
+    passed:
+      - "spring-cloud-dataflow-ci-images"
+  - get: git-repo
+    trigger: false
+  - get: acceptance-tests-trigger1
+    trigger: true
+    passed:
+      - "build-docker-servers"
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 90m
+      image: spring-cloud-dataflow-ci-image
+      file: git-repo/((base-path))/ci/tasks/build-project.yml
+      params:
+        BASE_PATH: ((base-path))
+        DATAFLOW_INCLUDE_TAGS: mariadb_10_2
+        REPORT_PATH: ((report-path))
+        REPORT_ID: mariadb102
+      on_failure:
+        aggregate:
+        - put: acceptance-tests-reports
+          params:
+            file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+- name: acceptance-tests-mariadb-10-3
+  serial: true
+  public: false
+  plan:
+  - get: spring-cloud-dataflow-ci-image
+    trigger: true
+    passed:
+      - "spring-cloud-dataflow-ci-images"
+  - get: git-repo
+    trigger: false
+  - get: acceptance-tests-trigger1
+    trigger: true
+    passed:
+      - "build-docker-servers"
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 90m
+      image: spring-cloud-dataflow-ci-image
+      file: git-repo/((base-path))/ci/tasks/build-project.yml
+      params:
+        BASE_PATH: ((base-path))
+        DATAFLOW_INCLUDE_TAGS: mariadb_10_3
+        REPORT_PATH: ((report-path))
+        REPORT_ID: mariadb103
+      on_failure:
+        aggregate:
+        - put: acceptance-tests-reports
+          params:
+            file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+- name: acceptance-tests-mariadb-10-4
+  serial: true
+  public: false
+  plan:
+  - get: spring-cloud-dataflow-ci-image
+    trigger: true
+    passed:
+      - "spring-cloud-dataflow-ci-images"
+  - get: git-repo
+    trigger: false
+  - get: acceptance-tests-trigger1
+    trigger: true
+    passed:
+      - "build-docker-servers"
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 90m
+      image: spring-cloud-dataflow-ci-image
+      file: git-repo/((base-path))/ci/tasks/build-project.yml
+      params:
+        BASE_PATH: ((base-path))
+        DATAFLOW_INCLUDE_TAGS: mariadb_10_4
+        REPORT_PATH: ((report-path))
+        REPORT_ID: mariadb104
+      on_failure:
+        aggregate:
+        - put: acceptance-tests-reports
+          params:
+            file: distribution-repository/spring-cloud-dataflow-acceptance-tests-*.tar.gz
+
+groups:
+- name: DB2
+  jobs:
+  - acceptance-tests-db2
+- name: MsSql
+  jobs:
+  - acceptance-tests-mssql
+- name: MySql
+  jobs:
+  - acceptance-tests-mysql-5-6
+  - acceptance-tests-mysql-5-7
+  - acceptance-tests-mysql-8-0
+- name: Oracle
+  jobs:
+  - acceptance-tests-oracle
+- name: Postgres
+  jobs:
+  - acceptance-tests-postgres
+- name: MariaDb
+  jobs:
+  - acceptance-tests-mariadb-10-1
+  - acceptance-tests-mariadb-10-2
+  - acceptance-tests-mariadb-10-3
+  - acceptance-tests-mariadb-10-4
+- name: Images
+  jobs:
+  - spring-cloud-dataflow-ci-images
+  - build-servers-with-drivers
+  - build-docker-servers
diff --git a/...ava/org/springframework/cloud/dataflow/acceptance/tests/DataflowServerMigrationTests.java b/...ava/org/springframework/cloud/dataflow/acceptance/tests/DataflowServerMigrationTests.java
@@ -30,6 +30,9 @@
 import org.springframework.cloud.dataflow.acceptance.tests.support.Migration;
 import org.springframework.cloud.dataflow.acceptance.tests.support.MsSql;
 import org.springframework.cloud.dataflow.acceptance.tests.support.Mysql;
+import org.springframework.cloud.dataflow.acceptance.tests.support.Mysql_5_6;
+import org.springframework.cloud.dataflow.acceptance.tests.support.Mysql_5_7;
+import org.springframework.cloud.dataflow.acceptance.tests.support.Mysql_8_0;
 import org.springframework.cloud.dataflow.acceptance.tests.support.Oracle;
 import org.springframework.cloud.dataflow.acceptance.tests.support.Postgres;
 
@@ -47,6 +50,8 @@
 @Migration
 public class DataflowServerMigrationTests extends AbstractDataflowTests {
 
+	// postgres
+
 	@Test
 	@Postgres
 	@DataflowAll
@@ -58,17 +63,43 @@ public void testMigrationFrom173ToLatestWithPostgres(DockerComposeInfo dockerCom
 		migrationAsserts(dockerComposeInfo);
 	}
 
+	// mysql
+
 	@Test
-	@Mysql
+	@Mysql_5_6
 	@DataflowAll
-	@DockerCompose(id = "db", order = 0, locations = { "src/test/resources/db/mysql.yml" }, services = { "mysql" })
+	@DockerCompose(id = "db", order = 0, locations = { "src/test/resources/db/mysql_5_6.yml" }, services = { "mysql" })
 	@DockerCompose(id = "dataflow17x", order = 1, locations = { "src/test/resources/dataflow/dataflow17xmysql.yml" }, services = { "dataflow" }, log = "dataflow17x/")
 	@DockerCompose(id = "dataflow20x", order = 2, locations = { "src/test/resources/dataflowandskipper/dataflow20xmysql.yml" }, services = { "dataflow" }, start = false, log = "dataflow20x/")
 	@DockerCompose(id = "skipper", order = 3, locations = { "src/test/resources/skipper/skipper20xmysql.yml" }, services = { "skipper" }, start = false)
-	public void testMigrationFrom173ToLatestWithMysql(DockerComposeInfo dockerComposeInfo) throws Exception {
+	public void testMigrationFrom173ToLatestWithMysql56(DockerComposeInfo dockerComposeInfo) throws Exception {
 		migrationAsserts(dockerComposeInfo);
 	}
 
+	@Test
+	@Mysql_5_7
+	@DataflowAll
+	@DockerCompose(id = "db", order = 0, locations = { "src/test/resources/db/mysql_5_7.yml" }, services = { "mysql" })
+	@DockerCompose(id = "dataflow17x", order = 1, locations = { "src/test/resources/dataflow/dataflow17xmysql.yml" }, services = { "dataflow" }, log = "dataflow17x/")
+	@DockerCompose(id = "dataflow20x", order = 2, locations = { "src/test/resources/dataflowandskipper/dataflow20xmysql.yml" }, services = { "dataflow" }, start = false, log = "dataflow20x/")
+	@DockerCompose(id = "skipper", order = 3, locations = { "src/test/resources/skipper/skipper20xmysql.yml" }, services = { "skipper" }, start = false)
+	public void testMigrationFrom173ToLatestWithMysql57(DockerComposeInfo dockerComposeInfo) throws Exception {
+		migrationAsserts(dockerComposeInfo);
+	}
+
+	@Test
+	@Mysql_8_0
+	@DataflowAll
+	@DockerCompose(id = "db", order = 0, locations = { "src/test/resources/db/mysql_8_0.yml" }, services = { "mysql" })
+	@DockerCompose(id = "dataflow17x", order = 1, locations = { "src/test/resources/dataflow/dataflow17xmysql.yml" }, services = { "dataflow" }, log = "dataflow17x/")
+	@DockerCompose(id = "dataflow20x", order = 2, locations = { "src/test/resources/dataflowandskipper/dataflow20xmysql.yml" }, services = { "dataflow" }, start = false, log = "dataflow20x/")
+	@DockerCompose(id = "skipper", order = 3, locations = { "src/test/resources/skipper/skipper20xmysql.yml" }, services = { "skipper" }, start = false)
+	public void testMigrationFrom173ToLatestWithMysql80(DockerComposeInfo dockerComposeInfo) throws Exception {
+		migrationAsserts(dockerComposeInfo);
+	}
+
+	// oracle
+
 	@Test
 	@Oracle
 	@DataflowAll
@@ -80,6 +111,8 @@ public void testMigrationFrom173ToLatestWithOracle(DockerComposeInfo dockerCompo
 		migrationAsserts(dockerComposeInfo);
 	}
 
+	// mssql
+
 	@Test
 	@MsSql
 	@DataflowAll
@@ -91,6 +124,8 @@ public void testMigrationFrom173ToLatestWithMsSql(DockerComposeInfo dockerCompos
 		migrationAsserts(dockerComposeInfo);
 	}
 
+	// db2
+
 	@Test
 	@Db2
 	@DataflowAll