diff --git a/builds/e2e/nested-e2e.yaml b/builds/e2e/nested-e2e.yaml index 809f13039c0..d01a1b52acb 100644 --- a/builds/e2e/nested-e2e.yaml +++ b/builds/e2e/nested-e2e.yaml @@ -85,7 +85,7 @@ stages: inputs: targetType: inline script: | - az login --service-principal -p $(edgebuild-service-principal-secret) -u $(servicePrincipal.clientId) --tenant $(servicePrincipal.tenantId) + sudo az login --service-principal -p $(edgebuild-service-principal-secret) -u $(servicePrincipal.clientId) --tenant $(servicePrincipal.tenantId) - template: templates/nested-get-root-ca.yaml - template: templates/nested-get-device-name.yaml @@ -103,6 +103,9 @@ stages: changeDeployConfigOnly: true level: 5 name: 5 + spsecret: $(edgebuild-service-principal-secret) + spclientid: $(servicePrincipal.clientId) + sptenantid: $(servicePrincipal.tenantId) - template: templates/nested-deploy-config.yaml parameters: deviceId: $(parentDeviceId) @@ -110,6 +113,9 @@ stages: changeDeployConfigOnly: true level: 4 name: 4 + spsecret: $(edgebuild-service-principal-secret) + spclientid: $(servicePrincipal.clientId) + sptenantid: $(servicePrincipal.tenantId) - template: templates/e2e-run.yaml parameters: EventHubCompatibleEndpoint: '$(IotHub-EventHubConnStr)' diff --git a/builds/e2e/templates/nested-deploy-config.yaml b/builds/e2e/templates/nested-deploy-config.yaml index 454fd669ee8..6303afb3123 100644 --- a/builds/e2e/templates/nested-deploy-config.yaml +++ b/builds/e2e/templates/nested-deploy-config.yaml @@ -39,4 +39,7 @@ steps: -proxyAddress "$(proxyAddress)" \ -changeDeployConfigOnly "${{ parameters.changeDeployConfigOnly }}" \ -waitForTestComplete \ + -servicePrincipalSecret "${{ parameters.spsecret }}" \ + -servicePrincipalClientId "${{ parameters.spclientid }}" \ + -servicePrincipalTenantId "${{ parameters.sptenantid }}" \ -cleanAll \ No newline at end of file diff --git a/scripts/linux/nested-edge-deploy-agent.sh b/scripts/linux/nested-edge-deploy-agent.sh index 27305f226e7..d94a9bdc4a8 100644 --- a/scripts/linux/nested-edge-deploy-agent.sh +++ b/scripts/linux/nested-edge-deploy-agent.sh @@ -123,7 +123,8 @@ function prepare_test_from_artifacts() { sudo cat ${deployment_working_file} #deploy the config in azure portal - az iot edge set-modules --device-id ${DEVICE_ID} --hub-name ${IOT_HUB_NAME} --content ${deployment_working_file} --output none + # az login --service-principal -p $(SP_SECRET) -u $(SP_CLIENTID) --tenant $(SP_TENANT) + sudo az iot edge set-modules --device-id ${DEVICE_ID} --hub-name ${IOT_HUB_NAME} --content ${deployment_working_file} --output none } function process_args() { @@ -191,6 +192,15 @@ function process_args() { elif [ $saveNextArg -eq 20 ]; then CHANGE_DEPLOY_CONFIG_ONLY="$arg" saveNextArg=0 + elif [ $saveNextArg -eq 21 ]; then + SP_SECRET="$arg" + saveNextArg=0 + elif [ $saveNextArg -eq 22 ]; then + SP_CLIENTID="$arg" + saveNextArg=0 + elif [ $saveNextArg -eq 23 ]; then + SP_TENANT="$arg" + saveNextArg=0 else case "$arg" in '-h' | '--help' ) usage;; @@ -214,9 +224,11 @@ function process_args() { '-iotHubName' ) saveNextArg=18;; '-proxyAddress' ) saveNextArg=19;; '-changeDeployConfigOnly' ) saveNextArg=20;; + '-servicePrincipalSecret' ) saveNextArg=21;; + '-servicePrincipalClientId' ) saveNextArg=22;; + '-servicePrincipalTenantId' ) saveNextArg=23;; '-waitForTestComplete' ) WAIT_FOR_TEST_COMPLETE=1;; '-cleanAll' ) CLEAN_ALL=1;; - * ) echo "Unsupported argument: $saveNextArg $arg" usage