Skip to content

Commit 8b14fcd

Browse files
committed
feat: Move back to startpaac for E2E testing
Updated environment variables and commands in the E2E workflow to reflect changes in domain names and the integration of the startpaac tool for cluster setup. This includes switching from `controller.paac-127-0-0-1.nip.io` to `paac.paac-127-0-0-1.nip.io` for controller and EL URLs, and utilizing `startpaac` for more streamlined cluster initialization. Additionally, updated Gitea internal URL to `forgejo-http.forgejo.svc.cluster.local`.
1 parent ec55549 commit 8b14fcd

File tree

10 files changed

+70
-971
lines changed

10 files changed

+70
-971
lines changed

.github/workflows/e2e.yaml

Lines changed: 70 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ jobs:
5353
]
5454

5555
env:
56-
CONTROLLER_DOMAIN_URL: controller.paac-127-0-0-1.nip.io
56+
CONTROLLER_DOMAIN_URL: paac.paac-127-0-0-1.nip.io
5757
KOCACHE: /tmp/ko-cache
58-
KO_DOCKER_REPO: localhost:5000
59-
KUBECONFIG: /home/runner/.kube/config.kind
58+
KO_DOCKER_REPO: registry.paac-127-0-0-1.nip.io
59+
KUBECONFIG: /home/runner/.kube/config.local
6060
TARGET_TEAM_SLUGS: "pipeline-as-code,pipeline-as-code-contributors"
6161
TEST_BITBUCKET_CLOUD_API_URL: https://api.bitbucket.org/2.0
6262
TEST_BITBUCKET_CLOUD_E2E_REPOSITORY: cboudjna/pac-e2e-tests
@@ -67,10 +67,10 @@ jobs:
6767
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
6868
TEST_BITBUCKET_SERVER_USER: pipelines
6969
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
70-
TEST_EL_URL: http://controller.paac-127-0-0-1.nip.io
70+
TEST_EL_URL: https://paac.paac-127-0-0-1.nip.io
7171
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
7272
TEST_GITEA_API_URL: http://localhost:3000
73-
TEST_GITEA_INTERNAL_URL: http://gitea.gitea:3000
73+
TEST_GITEA_INTERNAL_URL: http://forgejo-http.forgejo.svc.cluster.local:3000
7474
TEST_GITEA_PASSWORD: pac
7575
TEST_GITEA_REPO_OWNER: pac/pac
7676
TEST_GITEA_USERNAME: pac
@@ -81,7 +81,7 @@ jobs:
8181
TEST_GITHUB_REPO_OWNER_GITHUBAPP: openshift-pipelines/pipelines-as-code-e2e-tests
8282
TEST_GITHUB_REPO_OWNER_WEBHOOK: openshift-pipelines/pipelines-as-code-e2e-tests-webhook
8383
TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
84-
TEST_GITHUB_SECOND_EL_URL: http://ghe.paac-127-0-0-1.nip.io
84+
TEST_GITHUB_SECOND_EL_URL: https://ghe.paac-127-0-0-1.nip.io
8585
TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
8686
TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
8787
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
@@ -289,9 +289,20 @@ jobs:
289289
with:
290290
repo: chmouel/snazy
291291

292+
- name: Install minica
293+
run: |
294+
go install github.com/jsha/minica@latest
295+
echo "${HOME}/go/bin" >> "$GITHUB_PATH"
296+
297+
- name: Clone startpaac
298+
uses: actions/checkout@v6
299+
with:
300+
repository: openshift-pipelines/startpaac
301+
path: startpaac
302+
292303
- name: Run gosmee for main controller
293304
run: |
294-
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.PYSMEE_URL }} "http://${CONTROLLER_DOMAIN_URL}" > /tmp/gosmee-main.log 2>&1 &
305+
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.PYSMEE_URL }} "https://${CONTROLLER_DOMAIN_URL}" > /tmp/gosmee-main.log 2>&1 &
295306
296307
- name: Generate unique gosmee URL for Gitea tests
297308
if: startsWith(matrix.provider, 'gitea') || matrix.provider == 'concurrency'
@@ -302,14 +313,24 @@ jobs:
302313
echo "url=${SMEE_URL}" >> "$GITHUB_OUTPUT"
303314
echo "TEST_GITEA_SMEEURL=${SMEE_URL}" >> "$GITHUB_ENV"
304315
316+
- name: Run gosmee for main controller (Gitea)
317+
if: startsWith(matrix.provider, 'gitea') || matrix.provider == 'concurrency'
318+
run: |
319+
nohup gosmee client --saveDir /tmp/gosmee-replay "${TEST_GITEA_SMEEURL}" "https://${CONTROLLER_DOMAIN_URL}" >> /tmp/gosmee-main.log 2>&1 &
320+
321+
- name: Run gosmee for second controller (GHE)
322+
if: matrix.provider == 'github_ghe' || matrix.provider == 'concurrency'
323+
run: |
324+
nohup gosmee client --saveDir /tmp/gosmee-replay-ghe ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }} "https://ghe.paac-127-0-0-1.nip.io" > /tmp/gosmee-ghe.log 2>&1 &
325+
305326
- name: Setup tmate session
306327
uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3
307328
# add all environment so we can debug easily
308329
env:
309-
CONTROLLER_DOMAIN_URL: controller.paac-127-0-0-1.nip.io
330+
CONTROLLER_DOMAIN_URL: paac.paac-127-0-0-1.nip.io
310331
KOCACHE: /tmp/ko-cache
311-
KO_DOCKER_REPO: localhost:5000
312-
KUBECONFIG: /home/runner/.kube/config.kind
332+
KO_DOCKER_REPO: registry.paac-127-0-0-1.nip.io
333+
KUBECONFIG: /home/runner/.kube/config.local
313334
TARGET_TEAM_SLUGS: "pipeline-as-code,pipeline-as-code-contributors"
314335
TEST_BITBUCKET_CLOUD_API_URL: https://api.bitbucket.org/2.0
315336
TEST_BITBUCKET_CLOUD_E2E_REPOSITORY: cboudjna/pac-e2e-tests
@@ -320,9 +341,10 @@ jobs:
320341
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
321342
TEST_BITBUCKET_SERVER_USER: pipelines
322343
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
323-
TEST_EL_URL: http://controller.paac-127-0-0-1.nip.io
344+
TEST_EL_URL: https://paac.paac-127-0-0-1.nip.io
324345
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
325346
TEST_GITEA_API_URL: http://localhost:3000
347+
TEST_GITEA_INTERNAL_URL: http://forgejo-http.forgejo.svc.cluster.local:3000
326348
TEST_GITEA_PASSWORD: pac
327349
TEST_GITEA_REPO_OWNER: pac/pac
328350
TEST_GITEA_USERNAME: pac
@@ -334,7 +356,7 @@ jobs:
334356
TEST_GITHUB_REPO_OWNER_WEBHOOK: openshift-pipelines/pipelines-as-code-e2e-tests-webhook
335357
TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
336358
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
337-
TEST_GITHUB_SECOND_EL_URL: http://ghe.paac-127-0-0-1.nip.io
359+
TEST_GITHUB_SECOND_EL_URL: https://ghe.paac-127-0-0-1.nip.io
338360
TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
339361
TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
340362
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
@@ -350,27 +372,45 @@ jobs:
350372
detached: true
351373
limit-access-to-actor: true
352374

353-
- name: Start installing cluster
354-
run: |
355-
export PAC_DIR=${PWD}
356-
bash -x ./hack/dev/kind/install.sh
357-
358-
- name: Create PAC github-app-secret
375+
- name: Start installing cluster with startpaac
359376
env:
360-
PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
361-
PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
362-
PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
377+
PAC_DIR: ${{ github.workspace }}
378+
PAAC_DOMAIN: paac-127-0-0-1.nip.io
363379
run: |
364-
./hack/gh-workflow-ci.sh create_pac_github_app_secret
365-
366-
- name: Create second Github APP Controller on GHE
367-
env:
368-
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
369-
TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
370-
TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
371-
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
380+
mkdir -p ~/secrets
381+
echo "${{ vars.APPLICATION_ID }}" > ~/secrets/github-application-id
382+
echo "${{ secrets.APP_PRIVATE_KEY }}" > ~/secrets/github-private-key
383+
echo "${{ secrets.WEBHOOK_SECRET }}" > ~/secrets/webhook.secret
384+
echo "${{ secrets.PYSMEE_URL }}" > ~/secrets/smee
385+
386+
mkdir -p ~/secrets-second
387+
echo "${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}" > ~/secrets-second/github-application-id
388+
echo "${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
389+
echo "${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}" > ~/secrets-second/webhook.secret
390+
echo "${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}" > ~/secrets-second/smee
391+
392+
export PAC_SECRET_FOLDER=~/secrets
393+
export PAC_SECOND_SECRET_FOLDER=~/secrets-second
394+
export TARGET_HOST=local
395+
396+
cd startpaac
397+
./startpaac --ci -a
398+
399+
- name: Install minica CA certificate to system trust store
400+
run: |
401+
set -x
402+
if [ -f /tmp/certs/minica.pem ]; then
403+
sudo mkdir -p /usr/local/share/ca-certificates/
404+
sudo cp /tmp/certs/minica.pem /usr/local/share/ca-certificates/minica.crt
405+
sudo update-ca-certificates
406+
else
407+
echo "ERROR: /tmp/certs/minica.pem not found"
408+
exit 1
409+
fi
410+
411+
- name: Configure git to skip TLS verification
372412
run: |
373-
./hack/gh-workflow-ci.sh create_second_github_app_controller_on_ghe
413+
git config --global http.sslVerify false
374414
375415
- name: Enable debug logging for e2e
376416
run: |

hack/dev/kind/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

hack/dev/kind/gitea/README.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)