update containers

build/.vsts-ci.yml

@@ -2,8 +2,25 @@ name: $(BuildID)_$(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Re
 variables:
   runCodesignValidationInjection: false
 resources:
-- repo: self
-  clean: true
+  containers:
+  - container: linux-c-ubuntu-2004
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-2004:latest
+  - container: linux-c-ubuntu-1804
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-1804:latest
+  - container: linux-c-ubuntu-clang
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-clang:latest
+  - container: linux-c-debian
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/linux-c-debian:latest
+  - container: linux-c-ubuntu-wolfssl
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-wolfssl:latest
+  - container: raspberrypi-c-buster
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/raspberrypi-c-buster:brown
 jobs:
 - job: checksubmodule
   pool:
@@ -51,11 +68,10 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: raspberrypi
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/raspberrypi-c-buster:brown"
+  container: raspberrypi-c-buster
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: raspberrypi
+  displayName: Raspberry Pi
   steps:
   - script: |
      chmod +x jenkins/raspberrypi_c_buster.sh
@@ -64,11 +80,10 @@ jobs:
   - script: sudo rm -rf $(Agent.BuildDirectory)/*
     displayName: 'cleanup'
 - job: linuxoptions
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/vsts-linux-c-ubuntu"
+  container: linux-c-ubuntu-2004
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: 'linux-options'
+  displayName: 'Linux Ubuntu 20.04 with Options'
   steps:
   - script: |
      if [ -f "jenkins/linux_c_option_test.sh" ]
@@ -81,6 +96,7 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: windowsdynamic
+  display: Windows Dynamic
   pool:
     name: 'sdk-c--win-vs2017'
   steps:
@@ -110,6 +126,7 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: OSX
+  displayName: OSX
   pool:
     name: OSX
   steps:
@@ -141,11 +158,10 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: clang
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/ubuntu-clang"
+  container: linux-c-ubuntu-clang
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: 'clang'
+  displayName: 'Linux Ubuntu Clang'
   steps:
   - script: |
      if [ -f "jenkins/ubuntu_clang.sh" ]
@@ -176,19 +192,53 @@ jobs:
   - script: sudo rm -rf $(Agent.BuildDirectory)/*
     displayName: 'cleanup'
     condition: always()
-- job: ubuntu1604
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/linux-c-ubuntu"
+- job: ubuntu1804
+  container: linux-c-ubuntu-1804
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: 'ubuntu1604'
+  displayName: 'Linux Ubuntu 18.04'
   steps:
   - script: |
-     if [ -f "jenkins/ubuntu1604_c.sh" ]
+     if [ -f "jenkins/ubuntu_c.sh" ]
      then
       export OPENSSL_ia32cap=0x00000000
       sudo chmod -R 755 .
-      sudo -E ./jenkins/ubuntu1604_c.sh
+      sudo -E ./jenkins/ubuntu_c.sh
+     fi
+    displayName: 'build'
+    env:
+      IOTHUB_CONNECTION_STRING: $(IOTHUB-CONNECTION-STRING)
+      IOTHUB_EVENTHUB_CONNECTION_STRING: $(IOTHUB-EVENTHUB-CONNECTION-STRING)
+      IOTHUB_E2E_X509_CERT_BASE64: $(IOTHUB-E2E-X509-CERT-BASE64)
+      IOTHUB_E2E_X509_PRIVATE_KEY_BASE64: $(IOTHUB-E2E-X509-PRIVATE-KEY-BASE64)
+      IOTHUB_E2E_X509_THUMBPRINT: $(IOTHUB-E2E-X509-THUMBPRINT)
+      IOTHUB_POLICY_KEY: $(IOTHUB-POLICY-KEY)
+      IOTHUB_PARTITION_COUNT: $(IOTHUB-PARTITION-COUNT)
+      STORAGE_ACCOUNT_CONNECTION_STRING: $(STORAGE-ACCOUNT-CONNECTION-STRING)
+      IOT_DPS_CONNECTION_STRING: $(IOT-DPS-CONNECTION-STRING)
+      IOT_DPS_ID_SCOPE: $(IOT-DPS-ID-SCOPE)
+      IOTHUB_CA_ROOT_CERT: $(IOTHUB-CA-ROOT-CERT)
+      IOTHUB_CA_ROOT_CERT_KEY: $(IOTHUB-CA-ROOT-CERT-KEY)
+      IOT_DPS_GLOBAL_ENDPOINT: $(IOT-DPS-GLOBAL-ENDPOINT)
+      IOTHUB_DEVICE_CONN_STRING_INVALIDCERT: $(IOTHUB-DEVICE-CONN-STRING-INVALIDCERT)
+      IOTHUB_CONN_STRING_INVALIDCERT: $(IOTHUB-CONN-STRING-INVALIDCERT)
+      DPS_GLOBALDEVICEENDPOINT_INVALIDCERT: $(DPS-GLOBALDEVICEENDPOINT-INVALIDCERT)
+      PROVISIONING_CONNECTION_STRING_INVALIDCERT: $(PROVISIONING-CONNECTION-STRING-INVALIDCERT)
+  - script: sudo rm -rf $(Agent.BuildDirectory)/*
+    displayName: 'cleanup'
+    condition: always()
+- job: ubuntu2004
+  container: linux-c-ubuntu-2004
+  pool: 
+    name: 'sdk-c--ubuntu-18'
+  displayName: 'Linux Ubuntu 20.04'
+  steps:
+  - script: |
+     if [ -f "jenkins/ubuntu_c.sh" ]
+     then
+      export OPENSSL_ia32cap=0x00000000
+      sudo chmod -R 755 .
+      sudo -E ./jenkins/ubuntu_c.sh
      fi
     displayName: 'build'
     env:
@@ -213,11 +263,10 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: linux_install_deps
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/c-debian"
+  container: linux-c-debian
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: 'linux_install_deps'
+  displayName: 'Linux Debian with Installed Deps'
   steps:
   - script: |
      if [ -f "jenkins/linux_install_deps.sh" ]
@@ -249,11 +298,10 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: debian
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/c-debian"
+  container: linux-c-debian
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: 'debian'
+  displayName: 'Linux Debian'
   steps:
   - script: |
      if [ -f "jenkins/debian_c.sh" ]
@@ -285,11 +333,10 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: wolfssl
-  variables:
-    _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/vsts-c-wolfssl"
+  container: linux-c-ubuntu-wolfssl
   pool: 
     name: 'sdk-c--ubuntu-18'
-  displayName: 'wolfssl'
+  displayName: 'WolfSSL'
   steps:
   - script: |
      if [ -f "jenkins/linux_wolfssl.sh" ]
@@ -323,7 +370,7 @@ jobs:
 - job: windowsx64
   pool:
     name: 'sdk-c--win-vs2017'
-  displayName: 'windowsx64'
+  displayName: 'Windows x64'
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
@@ -352,6 +399,7 @@ jobs:
     displayName: 'cleanup'
     condition: always()
 - job: xcodenative
+  container: XCode Native
   pool:
     name: OSX
   steps: