chore: revert to parallalism for windows

Author: parker-snyk

.circleci/cache-python-docker.sh

@@ -3,11 +3,14 @@ set -e
 
 # Script to manage Docker image caching on Windows CircleCI
 # Usage: ./cache-python-docker.sh [load|save|pull]
+#
+# Uses environment variable DOCKER_IMAGE_WAS_CACHED to track state across CircleCI steps:
+# - true: Image was already present (loaded from cache or previously pulled)
+# - false: Image was newly pulled in this run and should be saved to cache
 
 CACHE_DIR="/c/docker-cache"
 PYTHON_IMAGE="python@sha256:1f92d35b567363820d0f2f37c7ccf2c1543e2d852cea01edb027039e6aef25e6"
 PYTHON_IMAGE_FILE="python-3.9.0.tar"
-STATE_FILE="/tmp/.docker-cache-state"
 
 # Function to check if image exists
 image_exists() {
@@ -35,20 +38,33 @@ case "$1" in
     # Track if image was already present
     if image_exists "$PYTHON_IMAGE"; then
       echo "Python image already exists locally"
-      echo "already_present" > "$STATE_FILE"
+      # Set environment variable for CircleCI (persists across steps)
+      if [ -n "$BASH_ENV" ]; then
+        echo "export DOCKER_IMAGE_WAS_CACHED=true" >> $BASH_ENV
+      fi
+      export DOCKER_IMAGE_WAS_CACHED=true
     else
       echo "Python image not found locally, pulling from registry..."
       docker pull "$PYTHON_IMAGE"
       echo "Python image pulled successfully"
-      echo "newly_pulled" > "$STATE_FILE"
+      # Set environment variable for CircleCI (persists across steps)
+      if [ -n "$BASH_ENV" ]; then
+        echo "export DOCKER_IMAGE_WAS_CACHED=false" >> $BASH_ENV
+      fi
+      export DOCKER_IMAGE_WAS_CACHED=false
     fi
     ;;
 
   save)
     echo "=== Saving Docker images to cache ==="
 
+    # Source BASH_ENV to get environment variables from previous steps
+    if [ -n "$BASH_ENV" ] && [ -f "$BASH_ENV" ]; then
+      source $BASH_ENV
+    fi
+    
     # Check if we should save (only if we pulled it this run)
-    if [ -f "$STATE_FILE" ] && [ "$(cat $STATE_FILE)" = "newly_pulled" ]; then
+    if [ "$DOCKER_IMAGE_WAS_CACHED" = "false" ]; then
       mkdir -p "$CACHE_DIR"
 
       if image_exists "$PYTHON_IMAGE"; then
@@ -63,11 +79,8 @@ case "$1" in
         exit 1
       fi
     else
-      echo "Python image was already cached, skipping save"
+      echo "Python image was already cached (DOCKER_IMAGE_WAS_CACHED=$DOCKER_IMAGE_WAS_CACHED), skipping save"
     fi
-    
-    # Clean up state file
-    rm -f "$STATE_FILE"
     ;;
 
   *)

.circleci/config.yml

@@ -56,6 +56,7 @@ windows_medium: &windows_medium
     name: win/server-2022
     shell: bash.exe
     size: medium
+    version: "2023.05.1"
   parameters:
     node_version:
       type: string
@@ -181,7 +182,8 @@ jobs:
           path: test-logs.txt
           destination: test-logs
   test_jest_windows_with_docker:
-    <<: *windows_big
+    <<: *windows_medium
+    parallelism: 2  # Run tests across 2 containers
     steps:
       - checkout
       - install_node_npm:
@@ -198,6 +200,7 @@ jobs:
       - save_cache:
           key: v1-win-dependencies-{{ checksum "package.json" }}
           paths:
+            - node_modules
             - .npm-cache
 
       - run: docker version
@@ -222,7 +225,8 @@ jobs:
       - run:
           name: Run Windows tests in parallel
           command: |
-            npm run test-jest-windows
+            TEST=$(circleci tests glob "test/windows/**/*.spec.ts" | circleci tests split --split-by=timings | sed 's#\\\\#/#g')
+            npm run test-jest-windows -- $TEST --reporters=default --reporters=jest-junit
           environment:
             JEST_JUNIT_OUTPUT_DIR: './reports/junit'
             JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true'  # We need this to make --split-by=timings work
@@ -240,7 +244,8 @@ jobs:
           paths:
             - C:\docker-cache
   test_jest_windows_no_docker:
-    <<: *windows_big
+    <<: *windows_medium
+    parallelism: 2  # Run tests across 2 containers
     steps:
       - checkout
       - install_node_npm:
@@ -257,6 +262,7 @@ jobs:
       - save_cache:
           key: v1-win-dependencies-{{ checksum "package.json" }}
           paths:
+            - node_modules
             - .npm-cache
         # make docker appear to be broken.
       - run: "function docker() { return 1; }"
@@ -266,15 +272,8 @@ jobs:
       - run:
           name: Run Windows tests in parallel
           command: |
-            echo "====Before===="
-            ls ${TMPDIR:-/tmp}
-            echo "==============="
-
-            npm run test-jest-windows
-
-            echo "====After===="
-            ls ${TMPDIR:-/tmp}
-            echo "==============="
+            TEST=$(circleci tests glob "test/windows/**/*.spec.ts" | circleci tests split --split-by=timings | sed 's#\\\\#/#g')
+            npm run test-jest-windows -- $TEST --reporters=default --reporters=jest-junit
           environment:
             JEST_JUNIT_OUTPUT_DIR: './reports/junit'
             JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true'  # We need this to make --split-by=timings work
@@ -298,13 +297,13 @@ jobs:
             echo $CLI_COMMIT_HASH >> /tmp/cli-version
       - restore_cache:
           keys:
-            - v1-cli-repo-g-{{ checksum "/tmp/cli-version" }}
-            - v1-cli-repo-g-
+            - v1-cli-repo-{{ checksum "/tmp/cli-version" }}
+            - v1-cli-repo-
       - run:
           name: Build Snyk CLI with latest changes
           command: ./.circleci/build-cli.sh
       - save_cache:
-          key: v1-cli-repo-g-{{ checksum "/tmp/cli-version" }}
+          key: v1-cli-repo-{{ checksum "/tmp/cli-version" }}
           paths:
             - ~/cli
   build_and_test_latest_go_binary:
@@ -384,8 +383,8 @@ workflows:
             - nodejs-install
             - snyk-bot-slack
           node_version: *windows_node_version
-          requires:
-            - Install, Lint, and Build
+          # requires:
+          #   - Install, Lint, and Build
           post-steps:
             - *slack-fail-notify
       - build_cli: