feedback

Author: hallvictoria

eng/ci/docker-tests.yml renamed to eng/ci/docker-consumption-tests.yml

@@ -1,10 +1,3 @@
-trigger:
-  batch: true
-  branches:
-    include:
-      - dev
-      - release/*
-
 # CI only, does not trigger on PRs.
 pr: none
 
@@ -42,7 +35,4 @@ extends:
     stages:
     - stage: RunDockerConsumptionTests
       jobs:
-        - template: /eng/templates/official/jobs/ci-consumption-tests.yml@self
-    - stage: RunDockerDedicatedTests
-      jobs:
-        - template: /eng/templates/official/jobs/ci-dedicated-tests.yml@self
+        - template: /eng/templates/official/jobs/ci-docker-consumption-tests.yml@self

eng/ci/docker-dedicated-tests.yml

@@ -0,0 +1,38 @@
+# CI only, does not trigger on PRs.
+pr: none
+
+schedules:
+  - cron: "0 11 * * *"
+    displayName: Run everyday at 6 AM CST
+    branches:
+      include:
+        - dev
+    always: true
+
+resources:
+  repositories:
+  - repository: 1es
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+  - repository: eng
+    type: git
+    name: engineering
+    ref: refs/tags/release
+
+variables:
+  - template: ci/variables/build.yml@eng
+  - template: /ci/variables/cfs.yml@eng
+
+extends:
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
+  parameters:
+    pool:
+      name: 1es-pool-azfunc
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+    - stage: RunDockerDedicatedTests
+      jobs:
+        - template: /eng/templates/official/jobs/ci-docker-dedicated-tests.yml@self

eng/ci/official-build.yml

@@ -55,11 +55,11 @@ extends:
       - stage: RunDockerConsumptionTests
         dependsOn: Build
         jobs:
-          - template: /eng/templates/official/jobs/ci-consumption-tests.yml@self
+          - template: /eng/templates/official/jobs/ci-docker-consumption-tests.yml@self
       - stage: RunDockerDedicatedTests
         dependsOn: Build
         jobs:
-          - template: /eng/templates/official/jobs/ci-dedicated-tests.yml@self
+          - template: /eng/templates/official/jobs/ci-docker-dedicated-tests.yml@self
       - stage: RunLinuxConsumptionTests
         dependsOn: Build
         jobs:

eng/templates/official/jobs/build-artifacts.yml

@@ -1,5 +1,9 @@
 jobs:
 - job: Build_WINDOWS_X64
+  pool:
+    name: 1es-pool-azfunc-public
+    image: 1es-windows-2022
+    os: windows
   strategy:
     matrix:
       Python37V4:
@@ -31,6 +35,10 @@ jobs:
       architecture: 'x64'
       artifactName: '$(pythonVersion)_WINDOWS_X64'
 - job: Build_WINDOWS_X86
+  pool:
+    name: 1es-pool-azfunc-public
+    image: 1es-windows-2022
+    os: windows
   strategy:
     matrix:
       Python37V4:
@@ -62,6 +70,10 @@ jobs:
       architecture: 'x86'
       artifactName: '$(pythonVersion)_WINDOWS_x86'
 - job: Build_LINUX_X64
+  pool:
+    name: 1es-pool-azfunc
+    image: 1es-ubuntu-22.04
+    os: linux
   strategy:
     matrix:
       Python37V4:
@@ -92,6 +104,10 @@ jobs:
       workerPath: '$(workerPath)'
       artifactName: '$(pythonVersion)_LINUX_X64'
 - job: Build_OSX_X64
+  pool:
+    name: Azure Pipelines
+    image: macOS-latest
+    os: macOS
   strategy:
     matrix:
       Python37V4:
@@ -122,6 +138,10 @@ jobs:
       workerPath: '$(workerPath)'
       artifactName: '$(pythonVersion)_OSX_X64'
 - job: Build_OSX_ARM64
+  pool:
+    name: Azure Pipelines
+    image: macOS-latest
+    os: macOS
   strategy:
     matrix:
       Python39V4:

eng/templates/official/jobs/ci-consumption-tests.yml renamed to eng/templates/official/jobs/ci-docker-consumption-tests.yml

@@ -132,11 +132,8 @@ def create_container(self, image_repo: str, image_url: str,
         )
 
         function_path = "/home/site/wwwroot"
-
-        if configs.libraries:
-            configs.libraries.append('azurefunctions-extensions-base')
-        else:
-            configs.libraries = ['azurefunctions-extensions-base']
+        configs.libraries = ((configs.libraries or [])
+                             + ['azurefunctions-extensions-base'])
         install_libraries_cmd = []
         install_libraries_cmd.extend(['pip', 'install'])
         install_libraries_cmd.extend(['--platform=manylinux2014_x86_64'])