Restructure templates

devops/nightly.yml

@@ -1,12 +1,47 @@
 name: $(Date:yyyyMMdd).$(Rev:r)
 
-stages:
-  - template: pr-gate-os.yml
+trigger: none # nightly build is scheduled once per day
 
-  - stage: publish_artifacts
-    jobs:
-      - job: archive_wheel_and_sdist
-        pool:
-          vmImage: 'ubuntu-latest'
-        steps:
-          - template: templates/build_wheel_n_sdist.yml
+stages:
+- stage: static_analysis
+  jobs:
+  - job: flake8_linux_py36
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      - template: templates/base/run-linter.yml
+        parameters:
+          pyVersion: '3.6'
+
+- stage: unit_tests
+  dependsOn: static_analysis
+  jobs:
+    - template: templates/run-tests-on-multiple-os-py.yml
+      parameters:
+        pyVersions: ['3.6']
+        testTypes: ['unit', 'io']
+        imageOSs: ['ubuntu-18.04']  # 'windows-latest', 'macos-latest'
+
+- stage: e2e_tests
+  dependsOn: static_analysis
+  jobs:
+    - template: templates/run-tests-on-multiple-os-py.yml
+      parameters:
+        pyVersions: ['3.6']
+        testTypes: ['azure']
+        imageOSs: ['ubuntu-18.04']  # 'windows-latest', 'macos-latest'
+
+- stage: collect_final_code_coverage
+  dependsOn: 
+    - unit_tests
+    - e2e_tests
+  jobs:
+    - template: templates/merge-cov-reports.yml
+
+- stage: publish_artifacts
+  jobs:
+    - job: archive_wheel_and_sdist
+      pool:
+        vmImage: 'ubuntu-latest'
+      steps:
+        - template: templates/build_wheel_n_sdist.yml

devops/pr-gate-os.yml

@@ -7,7 +7,7 @@ stages:
       pool:
         vmImage: 'ubuntu-latest'
       steps:
-        - template: templates/run-linter.yml
+        - template: templates/base/run-linter.yml
           parameters:
             pyVersion: '3.6'
 
@@ -35,24 +35,3 @@ stages:
       - e2e_tests
     jobs:
       - template: templates/merge-cov-reports.yml
-
-
-# - template: templates/publish-cov.yml
-  
-# - bash: |
-#     python setup.py bdist_wheel --build-number $(Build.BuildNumber) --dist-dir dist
-#   workingDirectory: $(Build.SourcesDirectory)
-#   displayName: 'Building wheel package'
-
-# - bash: |
-#     mkdir $BUILD_ARTIFACTSTAGINGDIRECTORY/py$(python.version)/
-#     cp -r dist/* $BUILD_ARTIFACTSTAGINGDIRECTORY/py$(python.version)/
-#   workingDirectory: $(Build.SourcesDirectory)
-#   displayName: 'Copying builds to artifact staging dir'
-
-# - task: PublishBuildArtifacts@1
-#   inputs:
-#     PathtoPublish: $(Build.ArtifactStagingDirectory)
-#     ArtifactName: genalog
-#     publishLocation: 'Container'
-#   displayName: 'Publish build as artifacts'

devops/pr-gate.yml

@@ -4,37 +4,37 @@ pr:
 - main
 
 stages:
-  - stage: static_analysis
-    jobs:
-    - job: flake8_linux_py36
-      pool:
-        vmImage: 'ubuntu-latest'
-      steps:
-        - template: templates/run-linter.yml
-          parameters:
-            pyVersion: '3.6'
-
-  - stage: unit_tests
-    dependsOn: static_analysis
-    jobs:
-      - template: templates/run-tests-on-multiple-os-py.yml
+- stage: static_analysis
+  jobs:
+  - job: flake8_linux_py36
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      - template: templates/base/run-linter.yml
         parameters:
-          pyVersions: ['3.6']
-          testTypes: ['unit']
-          imageOSs: ['ubuntu-18.04']  # 'windows-latest', 'macos-latest'
+          pyVersion: '3.6'
 
-  - stage: e2e_tests
-    dependsOn: static_analysis
-    jobs:
-      - template: templates/run-tests-on-multiple-os-py.yml
-        parameters:
-          pyVersions: ['3.6']
-          testTypes: ['io']
-          imageOSs: ['ubuntu-18.04']  # 'windows-latest', 'macos-latest'
+- stage: unit_tests
+  dependsOn: static_analysis
+  jobs:
+    - template: templates/run-tests-on-multiple-os-py.yml
+      parameters:
+        pyVersions: ['3.6']
+        testTypes: ['unit']
+        imageOSs: ['ubuntu-18.04']  # 'windows-latest', 'macos-latest'
 
-  - stage: collect_final_code_coverage
-    dependsOn: 
-      - unit_tests
-      - e2e_tests
-    jobs:
-      - template: templates/merge-cov-reports.yml
+- stage: e2e_tests
+  dependsOn: static_analysis
+  jobs:
+    - template: templates/run-tests-on-multiple-os-py.yml
+      parameters:
+        pyVersions: ['3.6']
+        testTypes: ['io']
+        imageOSs: ['ubuntu-18.04']  # 'windows-latest', 'macos-latest'
+
+- stage: collect_final_code_coverage
+  dependsOn: 
+    - unit_tests
+    - e2e_tests
+  jobs:
+    - template: templates/merge-cov-reports.yml

devops/templates/run-tests-on-multiple-os-py.yml

@@ -28,10 +28,10 @@ jobs:
         - template: install-dependencies.yml
 
         - ${{ each testType in parameters.testTypes }}:
-          - template: run-tests.yml
+          - template: base/run-tests.yml
             parameters:
               testType: ${{testType}}
-          - template: publish-test-results.yml
+          - template: base/publish-test-results.yml
             parameters:
               pyVersion: ${{pyVersion}}