chore: fix contributor pr workflow with ipv6 tests (#32500)

* chore: fix contributor pr workflow with ipv6 tests

* rename

Author: ryanthemanuel

.circleci/workflows.yml

@@ -1775,6 +1775,9 @@ jobs:
     <<: *defaults
     parameters:
       <<: *defaultsParameters
+      is_contributor_pr:
+        type: boolean
+        default: false
       resource_class:
         type: string
         default: medium
@@ -1797,31 +1800,46 @@ jobs:
           condition:
             equal: [ *windows-executor, << parameters.executor >> ]
           steps:
-            - run:
-                name: Enable IPv6 in Docker
-                command: |
-                  cat \<<'EOF' | sudo tee /etc/docker/daemon.json
-                  {
-                    "ipv6": true,
-                    "fixed-cidr-v6": "2001:db8:1::/64"
-                  }
-                  EOF
-                  cat \<<'EOF' | sudo tee /etc/hosts
-                  127.0.0.1 localhost
-                  ::1 localhost
-                  EOF
-                  sudo service docker restart
+            - unless:
+                condition: << parameters.is_contributor_pr >>
+                steps:
+                  - run:
+                      name: Enable IPv6 in Docker
+                      command: |
+                        cat \<<'EOF' | sudo tee /etc/docker/daemon.json
+                        {
+                          "ipv6": true,
+                          "fixed-cidr-v6": "2001:db8:1::/64"
+                        }
+                        EOF
+                        cat \<<'EOF' | sudo tee /etc/hosts
+                        127.0.0.1 localhost
+                        ::1 localhost
+                        EOF
+                        sudo service docker restart
             - run:
                 name: Test scripts
                 command: |
                   source ./scripts/ensure-node.sh
                   yarn test-scripts
-            - run:
-                name: Test each individual package
-                command: |
-                  source ./scripts/ensure-node.sh
-                  # this is needed since we are have to be running as root to test some packages
-                  sudo -E env "PATH=$PATH" yarn test
+            - when:
+                condition:
+                  not: << parameters.is_contributor_pr >>
+                steps:
+                  - run:
+                      name: Test each individual package
+                      command: |
+                        source ./scripts/ensure-node.sh
+                        # this is needed since we are have to be running as root to test some packages
+                        sudo -E env "PATH=$PATH" yarn test
+            - when:
+                condition: << parameters.is_contributor_pr >>
+                steps:
+                  - run:
+                      name: Test each individual package
+                      command: |
+                        source ./scripts/ensure-node.sh
+                        CIRCLE_IPV6_DISABLED=1 yarn test
             - run:
                 name: Test types
                 command: |
@@ -3341,6 +3359,7 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
         requires:
           - contributor-pr
     - unit-tests:
+        is_contributor_pr: true
         requires:
           - build
     - verify-release-readiness:

packages/network/test/integration/connect_spec.ts

@@ -43,6 +43,12 @@ describe('lib/connect', function () {
     // Error: listen EADDRNOTAVAIL ::1
     // NOTE: add an ipv6 lo if to the docker container
     it('resolves localhost on ::1 immediately', function () {
+      // If we are on CI and IPV6 is explicitly disabled (like in the contributor PR workflow)
+      // then we skip this test
+      if (process.env.CIRCLE_IPV6_DISABLED) {
+        this.skip()
+      }
+
       this.timeout(50)
 
       const server = net.createServer(_.partialRight(_.invoke, 'close'))

packages/network/test/unit/agent_spec.ts

@@ -1071,6 +1071,12 @@ describe('lib/agent', function () {
     })
 
     it('caches host + port', async function () {
+      // If we are on CI and IPV6 is explicitly disabled (like in the contributor PR workflow)
+      // then we skip this test
+      if (process.env.CIRCLE_IPV6_DISABLED) {
+        this.skip()
+      }
+
       const familyCache = {}
 
       await Promise.all([