Run integrations tests with dedicated containerd.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
aznashwan · Jun 20, 2023 · 0694c9b · 0694c9b
1 parent 6036ef7
commit 0694c9b
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.github/workflows/windows-periodic.yml b/.github/workflows/windows-periodic.yml
@@ -53,7 +53,7 @@ jobs:
           AZURE_RESOURCE_GROUP: ctrd-integration-ltsc2022-${{ github.run_id }}
           GOOGLE_BUCKET: "containerd-integration/logs/windows-ltsc2022/"
     runs-on: ubuntu-latest
-    timeout-minutes: 90
+    timeout-minutes: 360
     steps:
       - uses: actions/checkout@v3
 
@@ -158,20 +158,24 @@ jobs:
           ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "git clone http://github.com/containerd/containerd c:\\containerd "
           ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "cd c:\containerd ; make binaries"
 
+      - name: Setup containerd Service
+        run: |
+          ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "powershell.exe -command { C:\containerd\bin\containerd.exe --log-level=debug --log-file=C:/logs/containerd.log --service-name containerd --register-service ; Set-Service containerd -StartupType Automatic; Start-Service containerd }"
+
       - name: RunIntegrationTests
         id: RunIntegrationTests
         # NOTE(aznashwan): this is set to continue-on-error to allow the workflow to run until
         # the reports are converted/uploaded to GCloud so as to show up on testgrid.k8s.io too.
         continue-on-error: true
         run: |
           for i in $(seq 1 500); do
-            echo "### Run #$i: "
-            ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "sh.exe -s" << EOF
-              cd /c/containerd
-              export EXTRA_TESTFLAGS="-timeout=120m -run TestContainerPTY"
-              set -o pipefail
-              make integration | tee ${{ env.VM_INTEGRATION_LOGFILE }}
-            EOF
+          echo "### Run #$i: "
+          ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "sh.exe -s" << EOF
+            cd /c/containerd
+            export EXTRA_TESTFLAGS="-timeout=120m -run TestContainerPTY -no-daemon"
+            set -o pipefail
+            make integration | tee ${{ env.VM_INTEGRATION_LOGFILE }}
+          EOF
           done
           echo 'SUCCEEDED=1' >> $GITHUB_OUTPUT
 
@@ -226,7 +230,6 @@ jobs:
             SKIP='-ginkgo.skip="runtime should support exec with tty=true and stdin=true"'
           fi
 
-          ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "powershell.exe -command { C:\containerd\bin\containerd.exe --log-level=debug --log-file=C:/logs/containerd.log --service-name containerd --register-service ; Set-Service containerd -StartupType Automatic; Start-Service containerd }"
           ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "sh.exe -s" <<EOF
             sleep 5
             set -o pipefail