test (Azure#4496)

arlotito · Feb 26, 2021 · f7b44f4 · f7b44f4
1 parent eb554ab
commit f7b44f4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/builds/e2e/isa-95-smoke-test.yaml b/builds/e2e/isa-95-smoke-test.yaml
@@ -166,6 +166,10 @@ stages:
         parameters:
           agentName: $(deviceLvl3AgentName)
           lvl: 3
+      - pwsh: |
+          #Sleep 30s to let the rules time to set
+          Start-Sleep -s 30 
+        displayName: Wait for network to lock
       - template: templates/nested-get-root-ca.yaml    
       - template: templates/e2e-setup.yaml
       - template: templates/e2e-run.yaml

diff --git a/builds/e2e/templates/e2e-run.yaml b/builds/e2e/templates/e2e-run.yaml
@@ -42,7 +42,8 @@ steps:
       $filter += '&Category!=NestedEdgeOnly' 
     } 
 
-    sudo --preserve-env dotnet test $testFile --logger:trx --testcasefilter:$filter  
+    sudo --preserve-env dotnet test $testFile --logger:trx --testcasefilter:$filter 
+
   displayName: Run tests ${{ parameters.test_type }}
   continueOnError: true
   env:

diff --git a/scripts/linux/nested-edge-deploy-agent.sh b/scripts/linux/nested-edge-deploy-agent.sh
@@ -145,17 +145,26 @@ EOF
         echo "Adding proxy configuration to docker"
         sudo mkdir -p /etc/systemd/system/docker.service.d/
         { echo "[Service]";
-        echo "Environment=${PROXY_ADDRESS}";
+        echo "Environment=HTTPS_PROXY=${PROXY_ADDRESS}";
         } | sudo tee /etc/systemd/system/docker.service.d/http-proxy.conf
         sudo systemctl daemon-reload
         sudo systemctl restart docker
 
+        echo "Adding proxy configuration to IoT Edge daemon"
+        sudo mkdir -p /etc/systemd/system/aziot-identityd.service.d/
+        { echo "[Service]";
+        echo "Environment=HTTPS_PROXY=${PROXY_ADDRESS}";
+        } | sudo tee /etc/systemd/system/aziot-identityd.service.d/proxy.conf
+        sudo systemctl daemon-reload           
+
         echo "Adding proxy configuration to IoT Edge daemon"
         sudo mkdir -p /etc/systemd/system/aziot-edged.service.d/
         { echo "[Service]";
-        echo "Environment=${PROXY_ADDRESS}";
+        echo "Environment=HTTPS_PROXY=${PROXY_ADDRESS}";
         } | sudo tee /etc/systemd/system/aziot-edged.service.d/proxy.conf
         sudo systemctl daemon-reload
+
+
     fi
 
     echo "Start IoT edge"