CI Fixes

various ci fixes since we moved to stratpaac
Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>

Author: chmouel

.github/workflows/e2e.yaml

@@ -23,7 +23,7 @@ jobs:
     if: >
       github.event_name == 'schedule' || 
       (github.event_name == 'workflow_dispatch') || 
-      (github.event_name == 'pull_request_target' && (github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e')))
+      (startsWith(github.event_name, 'pull_request') && contains(github.event.pull_request.labels.*.name, 'e2e'))
 
     concurrency:
       group: ${{ github.workflow }}-${{ matrix.provider }}-${{ github.event.pull_request.number || github.ref }}
@@ -77,17 +77,20 @@ jobs:
           repo: chmouel/gosmee
 
       - name: Run gosmee main controller
+        run: |
+          nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.PYSMEE_URL }} "${TEST_EL_URL}" &
+
+      - name: Run gosmee gitea
         run: |
           nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.TEST_GITEA_SMEEURL }} "${TEST_EL_URL}" &
 
       - name: Run gosmee second controller
-        if: matrix.provider == 'providers'
         run: |
           nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }} "${TEST_GITHUB_SECOND_EL_URL}" &
 
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+        # if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
         env:
           PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
           PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
@@ -108,6 +111,7 @@ jobs:
           TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
           TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
           TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
+          PREVIOUS_SHA: ${{ github.event.before }}
         with:
           detached: true
           limit-access-to-actor: true
@@ -129,6 +133,14 @@ jobs:
       - name: Run E2E Tests
         if: ${{ github.event_name != 'schedule' || github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e') }}
         env:
+          PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+          PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
+          PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
+          PAC_SMEE_URL: ${{ secrets.PYSMEE_URL }}
+          TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
+          TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
+          TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
+          TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
           TEST_PROVIDER: ${{ matrix.provider }}
           TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
           TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
@@ -140,6 +152,7 @@ jobs:
           TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
           TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
           TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
+          PREVIOUS_SHA: ${{ github.event.before }}
         run: |
           ./hack/gh-workflow-ci.sh run_e2e_tests
 

hack/gh-workflow-ci.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2038,SC2153
 # Helper script for GitHub Actions CI, used from e2e tests.
-set -exufo pipefail
+set -eufo pipefail
 
 get_tests() {
   target=$1
@@ -58,7 +58,8 @@ EOF
   (
     cd ${HOME}/startpaac
     if [[ ${TEST_PROVIDER} == "providers" ]]; then
-      ./startpaac --all-github-second-no-forgejo
+      ./startpaac --all
+      ./startpaac --github-second-ctrl
     else
       ./startpaac --all
     fi