diff --git a/.github/workflows/kind-e2e-tests.yaml b/.github/workflows/kind-e2e-tests.yaml index 27ad76f654..1a50cb31d3 100644 --- a/.github/workflows/kind-e2e-tests.yaml +++ b/.github/workflows/kind-e2e-tests.yaml @@ -14,6 +14,7 @@ on: types: [ opened, synchronize, reopened ] paths: - "**.go" + - "/hack/gh-workflow-ci.sh" jobs: e2e-tests: concurrency: @@ -108,7 +109,8 @@ jobs: - name: Collect logs if: ${{ always() }} run: | - ./hack/gh-workflow-ci.sh collect_logs + ./hack/gh-workflow-ci.sh collect_logs \ + "${{ secrets.TEST_GITEA_SMEEURL }}" - name: Upload artifacts if: ${{ always() }} diff --git a/hack/gh-workflow-ci.sh b/hack/gh-workflow-ci.sh index ce20fffa9a..d10591ec58 100755 --- a/hack/gh-workflow-ci.sh +++ b/hack/gh-workflow-ci.sh @@ -82,9 +82,9 @@ run_e2e_tests() { export GO_TEST_FLAGS="-v -race -failfast" export TEST_BITBUCKET_CLOUD_API_URL=https://api.bitbucket.org/2.0 - export TEST_BITBUCKET_CLOUD_E2E_REPOSITORY=cboudjna/pac-e2e-tests + export TEST_BITBUCKET_CLOUD_E2E_REPOSITORY=zakisk/test-pac export TEST_BITBUCKET_CLOUD_TOKEN=${bitbucket_cloud_token} - export TEST_BITBUCKET_CLOUD_USER=cboudjna + export TEST_BITBUCKET_CLOUD_USER=zakisk-admin export TEST_EL_URL="http://${CONTROLLER_DOMAIN_URL}" export TEST_EL_WEBHOOK_SECRET="${webhook_secret}" @@ -125,10 +125,33 @@ run_e2e_tests() { } collect_logs() { + test_gitea_smeeurl="${1}" mkdir -p /tmp/logs kind export logs /tmp/logs [[ -d /tmp/gosmee-replay ]] && cp -a /tmp/gosmee-replay /tmp/logs/ + kind_folder=/tmp/logs/kind-control-plane + files=$(ls $kind_folder/containers) + for file in ${files}; do + if [[ "$file" == *"gosmee"* ]]; then + sed -i "s|${test_gitea_smeeurl}|TEST_GITEA_SMEEURL|g" "/tmp/logs/kind-control-plane/containers/$file" + fi + done + + gosmee_pod_folder="" + pods_folders=$(ls $kind_folder/pods) + for folder in ${pods_folders}; do + if [[ "$folder" == *"gitea_gosmee"* ]]; then + gosmee_pod_folder="$folder" + break + fi + done + + log_files=$(ls $kind_folder/pods/$gosmee_pod_folder/gosmee) + for log_file in ${log_files}; do + sed -i "s|${test_gitea_smeeurl}|TEST_GITEA_SMEEURL|g" $kind_folder/pods/$gosmee_pod_folder/gosmee/$log_file + done + kubectl get pipelineruns -A -o yaml >/tmp/logs/pac-pipelineruns.yaml kubectl get repositories.pipelinesascode.tekton.dev -A -o yaml >/tmp/logs/pac-repositories.yaml kubectl get configmap -n pipelines-as-code -o yaml >/tmp/logs/pac-configmap @@ -175,7 +198,7 @@ run_e2e_tests) run_e2e_tests "${2}" "${3}" "${4}" "${5}" "${6}" "${7}" "${8}" "${9}" "${10}" "${11}" ;; collect_logs) - collect_logs + collect_logs "${2}" ;; help) help