e2e test not skip

Author: yotamloe

.github/workflows/ci.yml

@@ -74,6 +74,18 @@ jobs:
       - name: Install package in development mode
         run: pip install -e .
 
+      - name: Verify secrets are configured
+        run: |
+          if [ -z "${{ secrets.LOGZIO_TOKEN }}" ]; then
+            echo "::error::LOGZIO_TOKEN secret is not configured"
+            exit 1
+          fi
+          if [ -z "${{ secrets.LOGZIO_API_KEY }}" ]; then
+            echo "::error::LOGZIO_API_KEY secret is not configured"
+            exit 1
+          fi
+          echo "✅ Required secrets are configured"
+
       - name: Generate unique ENV_ID
         id: env-id
         run: echo "value=e2e-${{ github.run_id }}-${{ github.run_attempt }}" >> $GITHUB_OUTPUT

.github/workflows/dependabot-automerge.yml

@@ -27,27 +27,57 @@ jobs:
       github.event.workflow_run.event == 'pull_request'
 
     steps:
-      - name: Checkout for metadata
-        uses: actions/checkout@v4
-
-      - name: Fetch Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v2
+      - name: Get PR number
+        id: pr
+        uses: actions/github-script@v7
         with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          script: |
+            const { data: pullRequests } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              head: `${context.repo.owner}:${context.payload.workflow_run.head_branch}`
+            });
+            
+            if (pullRequests.length > 0) {
+              const pr = pullRequests[0];
+              core.setOutput('number', pr.number);
+              core.setOutput('title', pr.title);
+              core.setOutput('found', 'true');
+              
+              // Check if it's a major update by looking at the PR title
+              // Dependabot titles include version info like "from 1.0.0 to 2.0.0"
+              const majorPattern = /from \d+\.\d+\.\d+ to (\d+)\./;
+              const match = pr.title.match(majorPattern);
+              if (match) {
+                const fromMajor = pr.title.match(/from (\d+)\./);
+                const toMajor = match[1];
+                if (fromMajor && fromMajor[1] !== toMajor) {
+                  core.setOutput('is_major', 'true');
+                } else {
+                  core.setOutput('is_major', 'false');
+                }
+              } else {
+                core.setOutput('is_major', 'false');
+              }
+              
+              console.log(`Found PR #${pr.number}: ${pr.title}`);
+            } else {
+              core.setOutput('found', 'false');
+              console.log('No matching PR found');
+            }
 
       - name: Auto-merge patch/minor updates
-        if: |
-          steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
-          steps.metadata.outputs.update-type == 'version-update:semver-minor'
+        if: steps.pr.outputs.found == 'true' && steps.pr.outputs.is_major != 'true'
         run: |
-          echo "Enabling auto-merge for ${{ steps.metadata.outputs.dependency-names }} (${{ steps.metadata.outputs.update-type }})"
-          gh pr merge --auto --merge "$HEAD_BRANCH"
+          echo "Enabling auto-merge for PR #${{ steps.pr.outputs.number }}"
+          echo "Title: ${{ steps.pr.outputs.title }}"
+          gh pr merge --auto --merge ${{ steps.pr.outputs.number }} --repo ${{ github.repository }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
 
       - name: Skip major updates
-        if: steps.metadata.outputs.update-type == 'version-update:semver-major'
+        if: steps.pr.outputs.found == 'true' && steps.pr.outputs.is_major == 'true'
         run: |
-          echo "Major version update for ${{ steps.metadata.outputs.dependency-names }} - review required"
+          echo "⚠️ Major version update detected - manual review required"
+          echo "PR #${{ steps.pr.outputs.number }}: ${{ steps.pr.outputs.title }}"

tests/e2e/test_logzio_e2e.py

@@ -22,11 +22,11 @@
 BASE_LOGZIO_API_URL = os.getenv("LOGZIO_API_URL", "https://api.logz.io/v1")
 
 
-def get_env_or_skip(var_name: str) -> str:
-    """Get environment variable or skip test if not set."""
+def get_env_or_fail(var_name: str) -> str:
+    """Get environment variable or fail test if not set."""
     value = os.environ.get(var_name)
     if not value:
-        pytest.skip(f"Environment variable {var_name} is not set")
+        pytest.fail(f"Required environment variable {var_name} is not set. Configure GitHub secret.")
     return value
 
 
@@ -96,9 +96,9 @@ class TestLogzioLogs:
     @pytest.fixture(autouse=True)
     def setup(self):
         """Set up test fixtures."""
-        self.token = get_env_or_skip("LOGZIO_TOKEN")
-        self.api_key = get_env_or_skip("LOGZIO_API_KEY")
-        self.env_id = get_env_or_skip("ENV_ID")
+        self.token = get_env_or_fail("LOGZIO_TOKEN")
+        self.api_key = get_env_or_fail("LOGZIO_API_KEY")
+        self.env_id = get_env_or_fail("ENV_ID")
 
     def test_logs_received(self):
         """Test that logs are received and have required fields."""