Skip to content

Commit dde099d

Browse files
committed
Pass cert path instead of base64 content
1 parent b3988bd commit dde099d

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

vsts/dps-e2e.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,11 @@ stages:
169169
170170
export DPS_ROOT_CA_CERT_PATH=$(pwd)/certs/azure-iot-test-only.root.ca.cert.pem
171171
export DPS_ROOT_CA_PK_PATH=$(pwd)/private/azure-iot-test-only.root.ca.key.pem
172-
export DPS_ROOT_CA_CERT_BASE64=$(base64 $DPS_ROOT_CA_CERT_PATH)
173-
export DPS_ROOT_CA_PK_BASE64=$(base64 $DPS_ROOT_CA_PK_PATH)
174172
export DPS_ROOT_CA_PASSWORD=1234
175173
176-
echo "DPS_ROOT_CA_CERT_BASE64=$DPS_ROOT_CA_CERT_BASE64"
177174
178175
echo "##vso[task.setvariable variable=DPS_ROOT_CA_CERT_PATH;isOutput=true]$DPS_ROOT_CA_CERT_PATH"
179176
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PK_PATH;isOutput=true]$DPS_ROOT_CA_PK_PATH"
180-
echo "##vso[task.setvariable variable=DPS_ROOT_CA_CERT_BASE64;isOutput=true]$DPS_ROOT_CA_CERT_BASE64"
181-
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PK_BASE64;isOutput=true]$DPS_ROOT_CA_PK_BASE64"
182177
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PASSWORD;isOutput=true]$DPS_ROOT_CA_PASSWORD"
183178
name: testCertificates
184179
displayName: Create Test Certificates
@@ -233,8 +228,8 @@ stages:
233228
DPS_CONNECTION_STRING: $[stageDependencies.setup.create_azure_resources.outputs['createAzureResources.DPS_CONNECTION_STRING']]
234229
DPS_ID_SCOPE: $[stageDependencies.setup.create_azure_resources.outputs['createAzureResources.DPS_ID_SCOPE']]
235230
DPS_HOSTNAME: $[stageDependencies.setup.create_azure_resources.outputs['createAzureResources.DPS_HOSTNAME']]
236-
DPS_ROOT_CA_CERT_BASE64: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_CERT_BASE64']]
237-
DPS_ROOT_CA_PK_BASE64: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_PK_BASE64']]
231+
DPS_ROOT_CA_CERT_PATH: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_CERT_PATH']]
232+
DPS_ROOT_CA_PK_PATH: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_PK_PATH']]
238233
DPS_ROOT_CA_PASSWORD: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_PASSWORD']]
239234
pool:
240235
vmImage: 'ubuntu-22.04'
@@ -258,8 +253,12 @@ stages:
258253
displayName: 'create RANDFILE file (needed to store seed data) separately due to openssl version issues in the pipeline'
259254
260255
- script: |
256+
export PROVISIONING_ROOT_CERT=$(base64 $PROVISIONING_ROOT_CERT_PATH)
257+
export PROVISIONING_ROOT_CERT_KEY=$(base64 $PROVISIONING_ROOT_CERT_KEY_PATH)
258+
261259
echo "DPS_ROOT_CA_CERT_BASE64=$DPS_ROOT_CA_CERT_BASE64"
262260
echo "PROVISIONING_ROOT_CERT=$PROVISIONING_ROOT_CERT"
261+
echo "PROVISIONING_ROOT_CERT_KEY=$PROVISIONING_ROOT_CERT_KEY"
263262
264263
printenv | sort | grep DPS
265264
printenv | sort | grep PROV
@@ -276,8 +275,8 @@ stages:
276275
PROVISIONING_SERVICE_CONNECTION_STRING: $(DPS_CONNECTION_STRING)
277276
PROVISIONING_DEVICE_IDSCOPE: $(DPS_ID_SCOPE)
278277
279-
PROVISIONING_ROOT_CERT: $(DPS_ROOT_CA_CERT_BASE64)
280-
PROVISIONING_ROOT_CERT_KEY: $(DPS_ROOT_CA_PK_BASE64)
278+
PROVISIONING_ROOT_CERT_PATH: $(DPS_ROOT_CA_CERT_PATH)
279+
PROVISIONING_ROOT_CERT_KEY_PATH: $(DPS_ROOT_CA_PK_PATH)
281280
PROVISIONING_ROOT_PASSWORD: $(DPS_ROOT_CA_PASSWORD)
282281
PYTHONUNBUFFERED: True
283282
@@ -295,6 +294,8 @@ stages:
295294
jobs:
296295
- job: destroy_azure_resource_group
297296
condition: always() # Run job even if the pipeline run is cancelled.
297+
pool:
298+
vmImage: 'ubuntu-24.04'
298299
variables:
299300
AZURE_RESOURCE_GROUP: $[stageDependencies.setup.create_azure_resources.outputs['setResourceNames.AZURE_RESOURCE_GROUP']]
300301
steps:

0 commit comments

Comments
 (0)