git status

rm .github/workflows/crowdsec-integration.yml .github/workflows/rate-limit-integration.yml .github/workflows/waf-integration.yml .github/workflows/e2e-tests.yml
fix(ci): add image_tag input for manual triggers in integration workflows

.github/workflows/e2e-tests.yml

@@ -54,6 +54,10 @@ on:
           - firefox
           - webkit
           - all
+      image_tag:
+        description: 'Docker image tag to test (e.g., pr-123-abc1234, latest)'
+        required: false
+        type: string
 
 env:
   NODE_VERSION: '20'
@@ -70,7 +74,11 @@ env:
 # Prevent race conditions when PR is updated mid-test
 # Cancels old test runs when new build completes with different SHA
 concurrency:
+<<<<<<< HEAD
   group: e2e-${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.ref }}-${{ github.event.workflow_run.head_sha || github.sha }}
+=======
+  group: e2e-${{ github.workflow }}-${{ github.ref }}
+>>>>>>> 8edde88f (fix(ci): add image_tag input for manual triggers in integration workflows)
   cancel-in-progress: true
 
 jobs:
@@ -163,6 +171,7 @@ jobs:
           echo "sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
           echo "Determined image tag: $(cat $GITHUB_OUTPUT | grep tag=)"
 
+<<<<<<< HEAD
       # Pull image from registry with retry logic (dual-source strategy)
       # Try registry first (fast), fallback to artifact if registry fails
       - name: Pull Docker image from registry
@@ -228,6 +237,14 @@ jobs:
           else
             echo "✅ Image SHA matches expected commit"
           fi
+=======
+      # Download Docker image artifact from build job
+      - name: Download Docker image
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          name: docker-image
+          path: .
+>>>>>>> 8edde88f (fix(ci): add image_tag input for manual triggers in integration workflows)
 
       - name: Validate Emergency Token Configuration
         run: |