Move conformance tests to a template.

Author: bgrainger

.ci/conformance-test-steps.yml

@@ -0,0 +1,29 @@
+parameters:
+  image: ''
+  connectionString: ''
+
+steps:
+- task: DeleteFiles@1
+  condition: always()
+  inputs:
+    contents: '**/*.trx'
+- task: DownloadPipelineArtifact@0
+  condition: always()
+  inputs:
+    artifactName: 'Conformance.Tests-3.0-$(Agent.OS)'
+    targetPath: '$(Build.BinariesDirectory)/3.0'
+- task: DotNetCoreCLI@2
+  displayName: 'Conformance Tests'
+  inputs:
+    command: 'custom'
+    custom: 'vstest'
+    arguments: '$(Build.BinariesDirectory)/3.0/Conformance.Tests.dll /logger:trx'
+  env:
+    CONNECTION_STRING: ${{ parameters.connectionString }}
+- task: PublishTestResults@2
+  condition: always()
+  inputs:
+    testResultsFormat: VSTest
+    testResultsFiles: '**/*.trx'
+    testRunTitle: ${{ format('Conformance Tests, {0}, $(Agent.OS)', parameters.image) }}
+    failTaskOnFailedTests: true

.ci/install-mysql-windows.yml

@@ -9,7 +9,6 @@ steps:
   displayName: Install MySQL Server
 - script: |
     "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -uroot -ptest -e "SET GLOBAL local_infile=1; SET GLOBAL log_bin_trust_function_creators=1;"
-    "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -uroot -ptest -e "CREATE SCHEMA conformance COLLATE utf8mb4_bin;"
     "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -uroot -ptest < $(Build.Repository.LocalPath)\.ci\server\init.sql
     "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -uroot -ptest < $(Build.Repository.LocalPath)\.ci\server\init_sha256.sql
     "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -uroot -ptest < $(Build.Repository.LocalPath)\.ci\server\init_caching_sha2.sql

.ci/integration-tests-steps.yml

@@ -6,6 +6,10 @@ parameters:
 steps:
 - bash: ${{ format('.ci/docker-run.sh {0} 3300 {1}', parameters.image, parameters.unsupportedFeatures) }}
   displayName: 'Start Docker container'
+- template: 'conformance-test-steps.yml'
+  parameters:
+    image: ${{ parameters.image }}
+    connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600'
 - template: 'sidebyside-test-steps.yml'
   parameters:
     image: ${{ parameters.image }}

.ci/server/init.sql

@@ -3,4 +3,4 @@ CREATE USER 'no_password'@'localhost';
 CREATE USER 'no_password'@'172.17.0.1';
 CREATE USER 'ssltest'@'%' IDENTIFIED BY 'test' /*!50706 REQUIRE SSL */; GRANT ALL PRIVILEGES ON *.* TO 'ssltest'@'%';
 SET GLOBAL max_allowed_packet=104857600;
-
+CREATE SCHEMA conformance COLLATE utf8mb4_bin;

azure-pipelines.yml

@@ -123,37 +123,20 @@ jobs:
     displayName: 'Install .NET Core'
     inputs:
       version: $(DotNetCoreSdkVersion)
-  - task: DownloadPipelineArtifact@0
-    condition: always()
-    inputs:
-      artifactName: 'Conformance.Tests-3.0-$(Agent.OS)'
-      targetPath: '$(Build.BinariesDirectory)/3.0'
-  - task: DotNetCoreCLI@2
-    displayName: 'Windows Conformance Tests'
-    inputs:
-      command: 'custom'
-      custom: 'vstest'
-      arguments: '$(Build.BinariesDirectory)/3.0/Conformance.Tests.dll /logger:trx'
-    env:
-      CONNECTION_STRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
-      TF_BUILD: $(TF_BUILD)
-  - task: PublishTestResults@2
-    condition: always()
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: '**/*.trx'
-      testRunTitle: 'Windows Conformance Tests'
-      failTaskOnFailedTests: true
+  - template: '.ci/conformance-test-steps.yml'
+    parameters:
+      image: 'mysql:8.0'
+      connectionString: 'server=localhost;port=3306;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
   - template: '.ci/sidebyside-test-steps.yml'
     parameters:
-      image: 'mysql-8.0.15'
+      image: 'mysql:8.0'
       unsupportedFeatures: 'Ed25519,Tls11,UnixDomainSocket'
       connectionString: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
       platform: 'netcoreapp3.0'
       description: 'No SSL'
   - template: '.ci/sidebyside-test-steps.yml'
     parameters:
-      image: 'mysql-8.0.15'
+      image: 'mysql:8.0'
       unsupportedFeatures: 'Ed25519,Tls11,UnixDomainSocket'
       connectionString: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
       platform: 'netcoreapp3.0'