add environment for e2e tests (linode#311)

* add environment for e2e tests

* checkout pull request head

* fix test failing due to service getting deleted and retry failing

Author: rahulait

.github/workflows/ci.yml

@@ -22,6 +22,8 @@ jobs:
       paths: ${{ steps.filter.outputs.changes }}
     steps:
       - uses: actions/[email protected]
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Harden Runner
         uses: step-security/harden-runner@v2
         with:
@@ -38,6 +40,7 @@ jobs:
 
   build-test:
     runs-on: ubuntu-latest
+    environment: ${{ github.event.pull_request.head.repo.fork == true && 'prod-external' || 'prod' }}
     needs: changes
     if: ${{ contains(fromJSON(needs.changes.outputs.paths), 'src') }}
     steps:
@@ -62,7 +65,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
@@ -95,6 +98,7 @@ jobs:
 
   docker-build:
     runs-on: ubuntu-latest
+    environment: ${{ github.event.pull_request.head.repo.fork == true && 'prod-external' || 'prod' }}
     steps:
       - uses: actions/[email protected]
         with:
@@ -120,6 +124,7 @@ jobs:
 
   e2e-tests:
     runs-on: ubuntu-latest
+    environment: ${{ github.event.pull_request.head.repo.fork == true && 'prod-external' || 'prod' }}
     needs: changes
     if: ${{ contains(fromJSON(needs.changes.outputs.paths), 'src') }}
     env:
@@ -133,7 +138,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Go
         uses: actions/setup-go@v5

e2e/test/lb-fw-delete-acl/chainsaw-test.yaml

@@ -117,6 +117,9 @@ spec:
             content: |
               set -e
 
+              nbid=0
+              fwid=0
+
               for i in {1..10}; do
                   nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
 
@@ -128,6 +131,18 @@ spec:
                   
                   fwid=$(echo $fw | jq -r '.data[].id')
 
+                  if [[ $nbid -ne 0 && $fwid -ne 0 ]]; then
+                      break
+                  fi
+                  sleep 2
+              done
+
+              if [[ $nbid -eq 0 || $fwid -eq 0 ]]; then
+                  echo "nb or fw not found"
+                  exit 1
+              fi
+
+              for i in {1..10}; do
                   # Remove service
                   kubectl delete service svc-test -n $NAMESPACE --ignore-not-found
                   sleep 5
@@ -145,6 +160,7 @@ spec:
                     -H "Authorization: Bearer $LINODE_TOKEN" \
                     -H "accept: application/json" \
                     "https://api.linode.com/v4/networking/firewalls/${fwid}" || true)
+
                   if [[ $nbRespCode == "404" && $fwRespCode == "404" ]]; then
                       echo "nb and fw deleted"
                       break