Update health test pipelines

Accelize · Apr 7, 2021 · ab54c2b · ab54c2b
1 parent 9f927c7
commit ab54c2b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/deployment/azure-pipelines-health-create-pkg.yml b/deployment/azure-pipelines-health-create-pkg.yml
@@ -50,17 +50,17 @@ stages:
     jobs:
       - template: runTestOnEc2.yml
         parameters:
+          identifier: full_features_on_single_design
+          description: full features on single design
           instance_type: 'f1.4xlarge'
           config_list:
           - os_distrib: 'centos_7'
-            tox_mode: 'debug'
-            tox_coverage: false
-          - os_distrib: 'ubuntu_18_04'
-            tox_mode: 'debug'
-            tox_coverage: false
-            dependsOn: 'centos_7'
+            tox_operation: '-p all -e aws-build-debug,cpp-debug,c-debug,integration-debug,coverage-debug'
+          #- os_distrib: 'ubuntu_18_04'
+          #  tox_operation: '-p all -e aws-build-debug,cpp-debug,c-debug,integration-debug,coverage-debug'
+          #  dependsOn: 'centos_7'
 
-  - stage: create_packages
+  - stage: build_packages
     displayName: Create packages
     # Build packages only if tagged or scheduled
     dependsOn: compile_and_test

diff --git a/deployment/azure-pipelines-health-test-pkg.yml b/deployment/azure-pipelines-health-test-pkg.yml
@@ -30,6 +30,8 @@ variables:
 jobs:
   - template: runTestFromPkgOnEc2.yml
     parameters:
+      identifier: install_and_test_packages
+      description: Install and test packages
       instance_type: 'f1.4xlarge'
       config_list:
       - os_distrib: 'centos_7'

diff --git a/deployment/runTestFromPkgOnEc2.yml b/deployment/runTestFromPkgOnEc2.yml
@@ -2,18 +2,21 @@
 # runTestFromPkgOnEc2.yml
 
 parameters:
+  identifier: 'test_on_aws'
+  description: 'Test on AWS'
   instance_type: 'f1.4xlarge'
   config_list:
   - os_distrib: 'centos_7'
+    tox_operation: '-e cpp-install,c-install,integration-install'
     tox_extra_option: ''
 
 jobs:
 - ${{ each config in parameters.config_list }}: # For each config
   # Start AWS agents
   - template: agents/start.yml@acid
     parameters:
-      jobName: startAgent_Aws_${{ config.os_distrib }}
-      agentDescription: AWS ${{ config.os_distrib }}
+      jobName: startAgent_${{ parameters.identifier }}_on_${{ config.os_distrib }}
+      agentDescription: ${{ parameters.description }} on AWS ${{ config.os_distrib }}
       provider: awsEc2
       image: ${{ config.os_distrib }}
       instanceType: ${{ parameters.instance_type }}
@@ -22,18 +25,18 @@ jobs:
       ansibleRequirements: deployment/requirements.yml
       dependsOn:
       - ${{ if config.dependsOn }}:
-        - runTests_Aws_${{ config.dependsOn }}
+        - runTests_${{ parameters.identifier }}_on_${{ config.dependsOn }}
       condition: succeededOrFailed()
 
   # Install Package on AWS agent
-  - job: runTests_Aws_${{ config.os_distrib }}
-    displayName: Install and run tests on AWS ${{ config.os_distrib }}
-    dependsOn: startAgent_Aws_${{ config.os_distrib }}
+  - job: runTests_${{ parameters.identifier }}_on_${{ config.os_distrib }}
+    displayName: Install and test ${{ parameters.description }} on ${{ config.os_distrib }}
+    dependsOn: startAgent_${{ parameters.identifier }}_on_${{ config.os_distrib }}
     condition: succeededOrFailed()
     pool:
       name: Default
       demands:  # Use previously instantiated agent
-        - agent.Name -equals $(Build.BuildId) AWS ${{ config.os_distrib }}
+        - agent.Name -equals $(Build.BuildId) ${{ parameters.description }} on AWS ${{ config.os_distrib }}
     steps:
       - checkout: self
         submodules: true
@@ -101,21 +104,21 @@ jobs:
         displayName: Install drmlib from package on ubuntu
         condition: ${{ contains(config.os_distrib, 'ubuntu') }}
 
-      - script: sudo -E tox -e cpp-install,c-install,integration-install
+      - script: sudo -E tox ${{ config.tox_operation }}
                 -- --cred=$(Build.SourcesDirectory)/cred.json --server=prod --artifacts_dir=$(Build.SourcesDirectory)/artifacts -rxs ${{ config.tox_extra_option }}
         displayName: Run tests from package with Tox on ${{ config.os_distrib }}
         env:
           TOX_PARALLEL_NO_SPINNER: 1
 
       - publish: $(Build.SourcesDirectory)/artifacts
-        artifact: AWS_Artifacts_${{ config.os_distrib }}
-        displayName: Publish AWS Artifacts for ${{ config.os_distrib }} package tests
+        artifact: AWS_Artifacts_${{ parameters.identifier }}_on_${{ config.os_distrib }}
+        displayName: Publish AWS Artifacts for ${{ parameters.identifier }} on ${{ config.os_distrib }} package tests
         condition: always()
 
   # Stop AWS agent
   - template: agents/stop.yml@acid
     parameters:
-      jobName: stopAgent_Aws_${{ config.os_distrib }}
+      jobName: stopAgent_${{ parameters.identifier }}_on_${{ config.os_distrib }}
       provider: awsEc2
-      agentDescription: AWS ${{ config.os_distrib }}
-      dependsOn: runTests_Aws_${{ config.os_distrib }}
+      agentDescription: ${{ parameters.description }} on AWS ${{ config.os_distrib }}
+      dependsOn: runTests_${{ parameters.identifier }}_on_${{ config.os_distrib }}