Skip to content

Commit fb1107a

Browse files
chmouelchmouel
committed
test ignore
Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>
1 parent adb6e8c commit fb1107a

File tree

4 files changed

+151
-62
lines changed

4 files changed

+151
-62
lines changed

‎.github/workflows/e2e.yaml‎

Lines changed: 107 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737

3838
env:
3939
KO_DOCKER_REPO: localhost:5000
40-
CONTROLLER_DOMAIN_URL: controller.paac-127-0-0-1.nip.io
40+
CONTROLLER_DOMAIN_URL: paac.127.0.0.1.nip.io
4141
TEST_GITHUB_REPO_OWNER_GITHUBAPP: openshift-pipelines/pipelines-as-code-e2e-tests
4242
KUBECONFIG: /home/runner/.kube/config.kind
4343
TEST_BITBUCKET_CLOUD_API_URL: https://api.bitbucket.org/2.0
4444
TEST_BITBUCKET_CLOUD_E2E_REPOSITORY: cboudjna/pac-e2e-tests
4545
TEST_BITBUCKET_CLOUD_USER: cboudjna
46-
TEST_EL_URL: http://controller.paac-127-0-0-1.nip.io
47-
TEST_GITEA_API_URL: http://localhost:3000
46+
TEST_EL_URL: https://paac.127.0.0.1.nip.io
47+
TEST_GITEA_API_URL: https://gitea.127.0.0.1.nip.io
4848
TEST_GITEA_USERNAME: pac
4949
TEST_GITEA_PASSWORD: pac
5050
TEST_GITEA_REPO_OWNER: pac/pac
@@ -53,11 +53,10 @@ jobs:
5353
TEST_GITHUB_PRIVATE_TASK_URL: https://github.com/openshift-pipelines/pipelines-as-code-e2e-tests-private/blob/main/remote_task.yaml
5454
TEST_GITHUB_PRIVATE_TASK_NAME: task-remote
5555
TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
56-
TEST_GITHUB_SECOND_EL_URL: http://ghe.paac-127-0-0-1.nip.io
56+
TEST_GITHUB_SECOND_EL_URL: https://ghe.127.0.0.1.nip.io
5757
TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
58-
TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
5958
TEST_GITLAB_API_URL: https://gitlab.com
60-
TEST_GITLAB_PROJECT_ID: 34405323
59+
TEST_GITLAB_PROJECT_ID: ${{ vars.TEST_GITLAB_PROJECT_ID }}
6160
TEST_BITBUCKET_SERVER_USER: pipelines
6261
TEST_BITBUCKET_SERVER_E2E_REPOSITORY: PAC/pac-e2e-tests
6362
steps:
@@ -76,65 +75,62 @@ jobs:
7675
with:
7776
repo: chmouel/gosmee
7877

79-
- name: Run gosmee
78+
- name: Run gosmee main controller
8079
run: |
81-
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.PYSMEE_URL }} "http://${CONTROLLER_DOMAIN_URL}" &
80+
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.TEST_GITEA_SMEEURL }} "${TEST_EL_URL}" &
81+
82+
- name: Run gosmee second controller
83+
run: |
84+
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }} "${TEST_GITHUB_SECOND_EL_URL}" &
8285
8386
- name: Setup tmate session
8487
uses: mxschmitt/action-tmate@v3
8588
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
86-
with:
87-
detached: true
88-
limit-access-to-actor: true
89-
90-
- name: Start installing cluster
91-
run: |
92-
export PAC_DIR=${PWD}
93-
export TEST_GITEA_SMEEURL="${{ secrets.TEST_GITEA_SMEEURL }}"
94-
bash -x ./hack/dev/kind/install.sh
95-
96-
- name: Create PAC github-app-secret
9789
env:
9890
PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
99-
PAC_GITHUB_APPLICATION_ID: ${{ secrets.APPLICATION_ID }}
91+
PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
10092
PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
101-
run: |
102-
./hack/gh-workflow-ci.sh create_pac_github_app_secret
103-
104-
- name: Create second Github APP Controller on GHE
105-
env:
93+
PAC_SMEE_URL: ${{ secrets.PYSMEE_URL }}
10694
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
10795
TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
10896
TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
109-
run: |
110-
./hack/gh-workflow-ci.sh create_second_github_app_controller_on_ghe
111-
112-
- name: Run E2E Tests
113-
if: ${{ github.event_name != 'schedule' || github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e') }}
114-
env:
97+
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
11598
TEST_PROVIDER: ${{ matrix.provider }}
11699
TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
117100
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
118101
TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
119-
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
102+
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ vars.INSTALLATION_ID }}
120103
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
121104
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
122105
TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
123106
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
124107
TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
125108
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
109+
with:
110+
detached: true
111+
limit-access-to-actor: true
112+
113+
- name: Start installing cluster
114+
env:
115+
PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
116+
PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
117+
PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
118+
PAC_SMEE_URL: ${{ secrets.PYSMEE_URL }}
119+
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
120+
TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
121+
TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
122+
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
126123
run: |
127-
./hack/gh-workflow-ci.sh run_e2e_tests
124+
./hack/gh-workflow-ci.sh startpaac
128125
129-
- name: Run E2E Tests on nightly
130-
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
126+
- name: Run E2E Tests
127+
if: ${{ github.event_name != 'schedule' || github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e') }}
131128
env:
132-
NIGHTLY_E2E_TEST: "true"
133129
TEST_PROVIDER: ${{ matrix.provider }}
134130
TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
135131
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
136132
TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
137-
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
133+
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ vars.INSTALLATION_ID }}
138134
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
139135
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
140136
TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
@@ -144,26 +140,77 @@ jobs:
144140
run: |
145141
./hack/gh-workflow-ci.sh run_e2e_tests
146142
147-
- name: Collect logs
148-
if: ${{ always() }}
149-
env:
150-
TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
151-
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
152-
run: |
153-
./hack/gh-workflow-ci.sh collect_logs
154-
155-
- name: Upload artifacts
156-
if: ${{ always() }}
157-
uses: actions/upload-artifact@v4
158-
with:
159-
name: logs-e2e-tests-${{ matrix.provider }}
160-
path: /tmp/logs
161-
162-
- name: Report Status
163-
if: ${{ always() && github.ref_name == 'main' && github.event_name == 'schedule' }}
164-
uses: ravsamhq/notify-slack-action@v2
165-
with:
166-
status: ${{ job.status }}
167-
notify_when: "failure"
168-
env:
169-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
143+
# - name: Create PAC github-app-secret
144+
# env:
145+
# PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
146+
# PAC_GITHUB_APPLICATION_ID: ${{ secrets.APPLICATION_ID }}
147+
# PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
148+
# run: |
149+
# ./hack/gh-workflow-ci.sh create_pac_github_app_secret
150+
#
151+
# - name: Create second Github APP Controller on GHE
152+
# env:
153+
# TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
154+
# TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
155+
# TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
156+
# run: |
157+
# ./hack/gh-workflow-ci.sh create_second_github_app_controller_on_ghe
158+
#
159+
# - name: Run E2E Tests
160+
# if: ${{ github.event_name != 'schedule' || github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e') }}
161+
# env:
162+
# TEST_PROVIDER: ${{ matrix.provider }}
163+
# TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
164+
# TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
165+
# TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
166+
# TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
167+
# TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
168+
# TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
169+
# TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
170+
# TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
171+
# TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
172+
# TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
173+
# run: |
174+
# ./hack/gh-workflow-ci.sh run_e2e_tests
175+
#
176+
# - name: Run E2E Tests on nightly
177+
# if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
178+
# env:
179+
# NIGHTLY_E2E_TEST: "true"
180+
# TEST_PROVIDER: ${{ matrix.provider }}
181+
# TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
182+
# TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
183+
# TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
184+
# TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
185+
# TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
186+
# TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
187+
# TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
188+
# TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
189+
# TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
190+
# TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
191+
# run: |
192+
# ./hack/gh-workflow-ci.sh run_e2e_tests
193+
#
194+
# - name: Collect logs
195+
# if: ${{ always() }}
196+
# env:
197+
# TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
198+
# TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
199+
# run: |
200+
# ./hack/gh-workflow-ci.sh collect_logs
201+
#
202+
# - name: Upload artifacts
203+
# if: ${{ always() }}
204+
# uses: actions/upload-artifact@v4
205+
# with:
206+
# name: logs-e2e-tests-${{ matrix.provider }}
207+
# path: /tmp/logs
208+
#
209+
# - name: Report Status
210+
# if: ${{ always() && github.ref_name == 'main' && github.event_name == 'schedule' }}
211+
# uses: ravsamhq/notify-slack-action@v2
212+
# with:
213+
# status: ${{ job.status }}
214+
# notify_when: "failure"
215+
# env:
216+
# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

‎.ko.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
defaultBaseImage: gcr.io/distroless/base-debian11:nonroot
1+
defaultBaseImage: quay.io/chmouel/ubi9-nonroot

‎hack/gh-workflow-ci.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,41 @@ run_e2e_tests() {
9191
make test-e2e GO_TEST_FLAGS="-run \"$(echo "${tests[*]}" | sed 's/ /|/g')\""
9292
}
9393

94+
startpaac() {
95+
[[ -d ~/startpaac ]] ||
96+
git clone --depth=1 https://github.com/chmouel/startpaac ~/startpaac
97+
98+
mkdir -p ~/second ~/pass $HOME/.config/startpaac
99+
100+
cat <<EOF >$HOME/.config/startpaac/config
101+
PAC_DIR=$HOME/work/pipelines-as-code/pipelines-as-code/
102+
PAC_SECRET_FOLDER=$HOME/pass
103+
PAC_SECOND_SECRET_FOLDER=${HOME}/second
104+
TARGET_HOST=local
105+
EOF
106+
107+
echo "${PAC_GITHUB_PRIVATE_KEY}" >~/pass/github-private-key
108+
echo "${PAC_GITHUB_APPLICATION_ID}" >~/pass/github-application-id
109+
echo "${PAC_WEBHOOK_SECRET}" >~/pass/webhook.secret
110+
echo "${PAC_SMEE_URL}" >~/pass/smee
111+
112+
echo "${TEST_GITHUB_SECOND_PRIVATE_KEY}" >~/second/github-private-key
113+
echo "${TEST_GITHUB_SECOND_APPLICATION_ID}" >~/second/github-application-id
114+
echo "${TEST_GITHUB_SECOND_WEBHOOK_SECRET}" >~/second/webhook.secret
115+
echo "${TEST_GITHUB_SECOND_SMEE_URL}" >~/second/smee
116+
117+
go install github.com/jsha/minica@latest
118+
119+
(
120+
cd ${HOME}/startpaac
121+
./startpaac --all
122+
./startpaac --github-second-ctrl
123+
)
124+
125+
sudo cp -v /tmp/certs/minica.pem /usr/local/share/ca-certificates/minica.crt
126+
sudo update-ca-certificates
127+
}
128+
94129
collect_logs() {
95130
# Read from environment variables
96131
local test_gitea_smee_url="${TEST_GITEA_SMEEURL}"
@@ -157,6 +192,10 @@ help() {
157192
collect_logs
158193
Collect logs from the cluster
159194
Required env vars: TEST_GITEA_SMEEURL, TEST_GITHUB_SECOND_SMEE_URL
195+
196+
startpaac
197+
Install startpaac and setup the config
198+
Required env vars: PAC_GITHUB_PRIVATE_KEY, PAC_GITHUB_APPLICATION_ID, PAC_WEBHOOK_SECRET, PAC_SMEE_URL
160199
EOF
161200
}
162201

@@ -173,6 +212,9 @@ run_e2e_tests)
173212
collect_logs)
174213
collect_logs
175214
;;
215+
startpaac)
216+
startpaac
217+
;;
176218
help)
177219
help
178220
exit 0

‎test/pkg/gitea/test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func TestPR(t *testing.T, topts *TestOpts) (context.Context, func()) {
128128
hookURL := os.Getenv("TEST_GITEA_SMEEURL")
129129
topts.InternalGiteaURL = os.Getenv("TEST_GITEA_INTERNAL_URL")
130130
if topts.InternalGiteaURL == "" {
131-
topts.InternalGiteaURL = "http://gitea.gitea:3000"
131+
topts.InternalGiteaURL = "http://forgejo.forgejo:3000"
132132
}
133133
if topts.ExtraArgs == nil {
134134
topts.ExtraArgs = map[string]string{}

0 commit comments

Comments
 (0)