chore: logging

Author: parker-snyk

.circleci/cache-python-docker.sh

@@ -1,25 +1,18 @@
 #!/bin/bash
 set -e
 
-# Because the Python image is >3GB the reason the pipeline takes
-# so damn long is because it's downloading the image every time.
-# The download takes longer than the actual tests.
-#
-# This script is used to cache the image and load it from cache
-# when the pipeline runs.
-#
-# The image is saved as a tar file and loaded from cache.
-# The image is pulled from the registry if it's not already present.
-#
-# It will save on time. It will save on bandwidth and CircleCI credits.
-# It will save my sanity.
-#
-# Usage: ./docker-cache.sh [load|save|pull]
+# Script to manage Docker image caching on Windows CircleCI
+# Usage: ./cache-python-docker.sh [load|save|pull]
 
 CACHE_DIR="/c/docker-cache"
-# This is the image we're caching, Python 3.9. Use the same sha as in test/windows/plugin.spec.ts
 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() {
+  docker images -q "$1" 2>/dev/null | grep -q .
+}
 
 case "$1" in
   load)
@@ -38,39 +31,49 @@ case "$1" in
   pull)
     echo "=== Pre-pulling Python test image ==="
     echo "Checking if Python image exists locally..."
-    if ! docker images -q "$PYTHON_IMAGE" 2>/dev/null | grep -q .; then
+    
+    # Track if image was already present
+    if image_exists "$PYTHON_IMAGE"; then
+      echo "Python image already exists locally"
+      echo "already_present" > "$STATE_FILE"
+    else
       echo "Python image not found locally, pulling from registry..."
       docker pull "$PYTHON_IMAGE"
       echo "Python image pulled successfully"
-    else
-      echo "Python image already exists locally"
+      echo "newly_pulled" > "$STATE_FILE"
     fi
     ;;
 
   save)
     echo "=== Saving Docker images to cache ==="
-    mkdir -p "$CACHE_DIR"
 
-    # Save the Python test image
-    if docker images -q "$PYTHON_IMAGE" 2>/dev/null | grep -q .; then
-      echo "Saving Python image to cache..."
-      docker save "$PYTHON_IMAGE" -o "$CACHE_DIR/$PYTHON_IMAGE_FILE"
-      echo "Python image saved to $CACHE_DIR/$PYTHON_IMAGE_FILE"
+    # Check if we should save (only if we pulled it this run)
+    if [ -f "$STATE_FILE" ] && [ "$(cat $STATE_FILE)" = "newly_pulled" ]; then
+      mkdir -p "$CACHE_DIR"
+      
+      if image_exists "$PYTHON_IMAGE"; then
+        echo "Saving newly pulled Python image to cache..."
+        docker save "$PYTHON_IMAGE" -o "$CACHE_DIR/$PYTHON_IMAGE_FILE"
+        echo "Python image saved to $CACHE_DIR/$PYTHON_IMAGE_FILE"
+        
+        # Show cache size
+        ls -lh "$CACHE_DIR/$PYTHON_IMAGE_FILE"
+      else
+        echo "ERROR: Python image not found locally despite being pulled"
+        exit 1
+      fi
     else
-      echo "Python image not found locally, skipping save"
+      echo "Python image was already cached, skipping save"
     fi
 
-    # List cached files
-    if [ -d "$CACHE_DIR" ] && [ "$(ls -A $CACHE_DIR/*.tar 2>/dev/null)" ]; then
-      echo "Cached Docker images:"
-      ls -lh $CACHE_DIR/*.tar
-    fi
+    # Clean up state file
+    rm -f "$STATE_FILE"
     ;;
 
   *)
     echo "Usage: $0 [load|save|pull]"
     echo "  load - Load Docker images from cache"
-    echo "  save - Save Docker images to cache" 
+    echo "  save - Save Docker images to cache (only if newly pulled)" 
     echo "  pull - Pull Python image if not already present"
     exit 1
     ;;

.circleci/config.yml

@@ -266,7 +266,15 @@ 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 "==============="
           environment:
             JEST_JUNIT_OUTPUT_DIR: './reports/junit'
             JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true'  # We need this to make --split-by=timings work