Merge pull request 6528 from hotfix/v4.3.2 into master

ci/build-and-test.yml

@@ -9,18 +9,18 @@ schedules:
  branches:
  include:
  - develop
-
-# Include shared variables
-variables:
-- template: shared-variables.yml
-- group: CIAutomation
 
 resources:
  repositories:
  - repository: ciTemplates # Id of the repository used to reference to in this script
  type: git
  name: common-ci # Name of the actual repository
 
+# Include shared variables
+variables:
+- template: shared-variables.yml@ciTemplates
+- group: CIAutomation
+
 stages:
 - template: shared-build-and-test-platforms.yml
  parameters:

ci/create-packages.yml

@@ -8,19 +8,20 @@ trigger:
 # Don't trigger for a pull request
 pr: none
 
+resources:
+ repositories:
+ - repository: ciTemplates # Id of the repository used to reference to in this script
+ type: git
+ name: common-ci # Name of the actual repository
+
 variables:
  - group: CIAutomation
  # Access token for the git repository. Used by the git tag task.
  - name: system_accesstoken
  value: $(System.AccessToken)
  # Include shared variables
  - template: shared-variables.yml
-
-resources:
- repositories:
- - repository: ciTemplates # Id of the repository used to reference to in this script
- type: git
- name: common-ci # Name of the actual repository
+ - template: shared-variables.yml@ciTemplates
 
 stages:
 

ci/deploy-external.yml

@@ -22,6 +22,7 @@ resources:
 # Include shared variables
 variables:
 - template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 - name: targetBranch
  value: 'refs/heads/master'
 

ci/deploy-internal.yml

@@ -12,11 +12,16 @@ resources:
  pipelines:
  - pipeline: build-pipeline # The name for the triggering build pipeline within this script
  source: location-python-create-packages # Name of the pipeline
- trigger: true 
+ trigger: true
+ repositories:
+ - repository: ciTemplates # Id of the repository used to reference to in this script
+ type: git
+ name: common-ci # Name of the actual repository
 
 # Include shared variables
 variables:
 - template: shared-variables.yml
+- template: shared-variables.yml@ciTemplates
 - name: targetBranch
  value: 'refs/heads/master'
 

ci/shared-variables.yml

@@ -1,13 +1,7 @@
 variables:
-- name: windowsImage
- value: 'vs2017-win2016'
-- name: linuxImage
- value: 'ubuntu-18.04'
-- name: macImage
- value: 'macOS-10.14'
 # Pipeline Package Version
 - name: pipelineVersion
- value: '==4.3.2'
+ value: '==4.3.5'
 # Python Version used to create packages
 - name: pythonVersionDefault
  value: '3.7'