Skip to content

Commit 18845a3

Browse files
committed
Pass root ca as base64 string
1 parent 70dacb2 commit 18845a3

1 file changed

Lines changed: 12 additions & 20 deletions

File tree

‎vsts/dps-e2e.yaml‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,16 @@ stages:
167167
# Root CA Certificate (create)
168168
openssl req -new -x509 -config ./openssl_root_ca.cnf -passin pass:1234 -key ./private/azure-iot-test-only.root.ca.key.pem -subj '/CN=Azure IoT Hub CA Cert Test Only' -days 30 -sha256 -extensions v3_ca -out ./certs/azure-iot-test-only.root.ca.cert.pem
169169
170-
export DPS_ROOT_CA_CERT=$(pwd)/certs/azure-iot-test-only.root.ca.cert.pem
171-
export DPS_ROOT_CA_PK=$(pwd)/private/azure-iot-test-only.root.ca.key.pem
170+
export DPS_ROOT_CA_CERT_PATH=$(pwd)/certs/azure-iot-test-only.root.ca.cert.pem
171+
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)
172174
export DPS_ROOT_CA_PASSWORD=1234
173175
174-
echo ">>>>>"
175-
ls -l $DPS_ROOT_CA_CERT
176-
ls -l $DPS_ROOT_CA_PK
177-
base64 -d $DPS_ROOT_CA_CERT
178-
echo "<<<<<"
179-
180-
echo "##vso[task.setvariable variable=DPS_ROOT_CA_CERT;isOutput=true]$DPS_ROOT_CA_CERT"
181-
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PK;isOutput=true]$DPS_ROOT_CA_PK"
176+
echo "##vso[task.setvariable variable=DPS_ROOT_CA_CERT_PATH;isOutput=true]$DPS_ROOT_CA_CERT_PATH"
177+
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PK_PATH;isOutput=true]$DPS_ROOT_CA_PK_PATH"
178+
echo "##vso[task.setvariable variable=DPS_ROOT_CA_CERT_BASE64;isOutput=true]$DPS_ROOT_CA_CERT_BASE64"
179+
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PK_BASE64;isOutput=true]$DPS_ROOT_CA_PK_BASE64"
182180
echo "##vso[task.setvariable variable=DPS_ROOT_CA_PASSWORD;isOutput=true]$DPS_ROOT_CA_PASSWORD"
183181
name: testCertificates
184182
displayName: Create Test Certificates
@@ -233,8 +231,8 @@ stages:
233231
DPS_CONNECTION_STRING: $[stageDependencies.setup.create_azure_resources.outputs['createAzureResources.DPS_CONNECTION_STRING']]
234232
DPS_ID_SCOPE: $[stageDependencies.setup.create_azure_resources.outputs['createAzureResources.DPS_ID_SCOPE']]
235233
DPS_HOSTNAME: $[stageDependencies.setup.create_azure_resources.outputs['createAzureResources.DPS_HOSTNAME']]
236-
DPS_ROOT_CA_CERT: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_CERT']]
237-
DPS_ROOT_CA_PK: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_PK']]
234+
DPS_ROOT_CA_CERT_BASE64: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_CERT_BASE64']]
235+
DPS_ROOT_CA_PK_BASE64: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_PK_BASE64']]
238236
DPS_ROOT_CA_PASSWORD: $[stageDependencies.setup.create_azure_resources.outputs['testCertificates.DPS_ROOT_CA_PASSWORD']]
239237
pool:
240238
vmImage: 'ubuntu-22.04'
@@ -258,12 +256,6 @@ stages:
258256
displayName: 'create RANDFILE file (needed to store seed data) separately due to openssl version issues in the pipeline'
259257
260258
- script: |
261-
echo ">>>>>"
262-
ls -l $PROVISIONING_ROOT_CERT
263-
ls -l $PROVISIONING_ROOT_CERT_KEY
264-
base64 -d $PROVISIONING_ROOT_CERT
265-
echo "<<<<<"
266-
267259
cd $(Build.SourcesDirectory)/tests/e2e/provisioning_e2e
268260
pytest --junitxml=junit/dps-e2e-test-results.xml
269261
displayName: 'Run Specified E2E Test with env variables'
@@ -276,8 +268,8 @@ stages:
276268
PROVISIONING_SERVICE_CONNECTION_STRING: $(DPS_CONNECTION_STRING)
277269
PROVISIONING_DEVICE_IDSCOPE: $(DPS_ID_SCOPE)
278270
279-
PROVISIONING_ROOT_CERT: $(DPS_ROOT_CA_CERT)
280-
PROVISIONING_ROOT_CERT_KEY: $(DPS_ROOT_CA_PK)
271+
PROVISIONING_ROOT_CERT: $(DPS_ROOT_CA_CERT_BASE64)
272+
PROVISIONING_ROOT_CERT_KEY: $(DPS_ROOT_CA_PK_BASE64)
281273
PROVISIONING_ROOT_PASSWORD: $(DPS_ROOT_CA_PASSWORD)
282274
PYTHONUNBUFFERED: True
283275

0 commit comments

Comments
 (0)