Skip to content

Commit 0829c6a

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

File tree

4 files changed

+161
-62
lines changed

4 files changed

+161
-62
lines changed

‎.github/workflows/e2e.yaml‎

Lines changed: 108 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@ 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
48+
TEST_GITEA_INTERNAL_URL: http://forgejo-http.forgejo.svc.cluster.local:3000
4849
TEST_GITEA_USERNAME: pac
4950
TEST_GITEA_PASSWORD: pac
5051
TEST_GITEA_REPO_OWNER: pac/pac
@@ -53,11 +54,10 @@ jobs:
5354
TEST_GITHUB_PRIVATE_TASK_URL: https://github.com/openshift-pipelines/pipelines-as-code-e2e-tests-private/blob/main/remote_task.yaml
5455
TEST_GITHUB_PRIVATE_TASK_NAME: task-remote
5556
TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
56-
TEST_GITHUB_SECOND_EL_URL: http://ghe.paac-127-0-0-1.nip.io
57+
TEST_GITHUB_SECOND_EL_URL: https://ghe.127.0.0.1.nip.io
5758
TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
58-
TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
5959
TEST_GITLAB_API_URL: https://gitlab.com
60-
TEST_GITLAB_PROJECT_ID: 34405323
60+
TEST_GITLAB_PROJECT_ID: ${{ vars.TEST_GITLAB_PROJECT_ID }}
6161
TEST_BITBUCKET_SERVER_USER: pipelines
6262
TEST_BITBUCKET_SERVER_E2E_REPOSITORY: PAC/pac-e2e-tests
6363
steps:
@@ -76,65 +76,62 @@ jobs:
7676
with:
7777
repo: chmouel/gosmee
7878

79-
- name: Run gosmee
79+
- name: Run gosmee main controller
8080
run: |
81-
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.PYSMEE_URL }} "http://${CONTROLLER_DOMAIN_URL}" &
81+
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.TEST_GITEA_SMEEURL }} "${TEST_EL_URL}" &
82+
83+
- name: Run gosmee second controller
84+
run: |
85+
nohup gosmee client --saveDir /tmp/gosmee-replay ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }} "${TEST_GITHUB_SECOND_EL_URL}" &
8286
8387
- name: Setup tmate session
8488
uses: mxschmitt/action-tmate@v3
8589
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
9790
env:
9891
PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
99-
PAC_GITHUB_APPLICATION_ID: ${{ secrets.APPLICATION_ID }}
92+
PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
10093
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:
94+
PAC_SMEE_URL: ${{ secrets.PYSMEE_URL }}
10695
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
10796
TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
10897
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:
98+
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
11599
TEST_PROVIDER: ${{ matrix.provider }}
116100
TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
117101
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
118102
TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
119-
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
103+
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ vars.INSTALLATION_ID }}
120104
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
121105
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
122106
TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
123107
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
124108
TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
125109
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
110+
with:
111+
detached: true
112+
limit-access-to-actor: true
113+
114+
- name: Start installing cluster
115+
env:
116+
PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
117+
PAC_GITHUB_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
118+
PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
119+
PAC_SMEE_URL: ${{ secrets.PYSMEE_URL }}
120+
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
121+
TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
122+
TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
123+
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
126124
run: |
127-
./hack/gh-workflow-ci.sh run_e2e_tests
125+
./hack/gh-workflow-ci.sh startpaac
128126
129-
- name: Run E2E Tests on nightly
130-
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
127+
- name: Run E2E Tests
128+
if: ${{ github.event_name != 'schedule' || github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e') }}
131129
env:
132-
NIGHTLY_E2E_TEST: "true"
133130
TEST_PROVIDER: ${{ matrix.provider }}
134131
TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
135132
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
136133
TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
137-
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
134+
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ vars.INSTALLATION_ID }}
138135
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
139136
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
140137
TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
@@ -144,26 +141,77 @@ jobs:
144141
run: |
145142
./hack/gh-workflow-ci.sh run_e2e_tests
146143
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 }}
144+
# - name: Create PAC github-app-secret
145+
# env:
146+
# PAC_GITHUB_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
147+
# PAC_GITHUB_APPLICATION_ID: ${{ secrets.APPLICATION_ID }}
148+
# PAC_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
149+
# run: |
150+
# ./hack/gh-workflow-ci.sh create_pac_github_app_secret
151+
#
152+
# - name: Create second Github APP Controller on GHE
153+
# env:
154+
# TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
155+
# TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
156+
# TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
157+
# run: |
158+
# ./hack/gh-workflow-ci.sh create_second_github_app_controller_on_ghe
159+
#
160+
# - name: Run E2E Tests
161+
# if: ${{ github.event_name != 'schedule' || github.event.label.name == 'e2e' || contains(github.event.pull_request.labels.*.name, 'e2e') }}
162+
# env:
163+
# TEST_PROVIDER: ${{ matrix.provider }}
164+
# TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
165+
# TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
166+
# TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
167+
# TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
168+
# TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
169+
# TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
170+
# TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
171+
# TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
172+
# TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
173+
# TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
174+
# run: |
175+
# ./hack/gh-workflow-ci.sh run_e2e_tests
176+
#
177+
# - name: Run E2E Tests on nightly
178+
# if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
179+
# env:
180+
# NIGHTLY_E2E_TEST: "true"
181+
# TEST_PROVIDER: ${{ matrix.provider }}
182+
# TEST_BITBUCKET_CLOUD_TOKEN: ${{ secrets.BITBUCKET_CLOUD_TOKEN }}
183+
# TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
184+
# TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
185+
# TEST_GITHUB_REPO_INSTALLATION_ID: ${{ secrets.INSTALLATION_ID }}
186+
# TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
187+
# TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
188+
# TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
189+
# TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
190+
# TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
191+
# TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
192+
# run: |
193+
# ./hack/gh-workflow-ci.sh run_e2e_tests
194+
#
195+
# - name: Collect logs
196+
# if: ${{ always() }}
197+
# env:
198+
# TEST_GITEA_SMEEURL: ${{ secrets.TEST_GITEA_SMEEURL }}
199+
# TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
200+
# run: |
201+
# ./hack/gh-workflow-ci.sh collect_logs
202+
#
203+
# - name: Upload artifacts
204+
# if: ${{ always() }}
205+
# uses: actions/upload-artifact@v4
206+
# with:
207+
# name: logs-e2e-tests-${{ matrix.provider }}
208+
# path: /tmp/logs
209+
#
210+
# - name: Report Status
211+
# if: ${{ always() && github.ref_name == 'main' && github.event_name == 'schedule' }}
212+
# uses: ravsamhq/notify-slack-action@v2
213+
# with:
214+
# status: ${{ job.status }}
215+
# notify_when: "failure"
216+
# env:
217+
# 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: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,50 @@ run_e2e_tests() {
9191
make test-e2e GO_TEST_FLAGS="-run \"$(echo "${tests[*]}" | sed 's/ /|/g')\""
9292
}
9393

94+
startpaac() {
95+
echo "**********************************************************************"
96+
echo " Installing startpaac"
97+
echo "**********************************************************************"
98+
[[ -d ~/startpaac ]] ||
99+
git clone --depth=1 https://github.com/chmouel/startpaac ~/startpaac
100+
101+
mkdir -p ~/second ~/pass $HOME/.config/startpaac
102+
103+
cat <<EOF >$HOME/.config/startpaac/config
104+
PAC_DIR=$HOME/work/pipelines-as-code/pipelines-as-code/
105+
PAC_SECRET_FOLDER=$HOME/pass
106+
PAC_SECOND_SECRET_FOLDER=${HOME}/second
107+
TARGET_HOST=local
108+
EOF
109+
110+
echo "${PAC_GITHUB_PRIVATE_KEY}" >~/pass/github-private-key
111+
echo "${PAC_GITHUB_APPLICATION_ID}" >~/pass/github-application-id
112+
echo "${PAC_WEBHOOK_SECRET}" >~/pass/webhook.secret
113+
echo "${PAC_SMEE_URL}" >~/pass/smee
114+
115+
echo "${TEST_GITHUB_SECOND_PRIVATE_KEY}" >~/second/github-private-key
116+
echo "${TEST_GITHUB_SECOND_APPLICATION_ID}" >~/second/github-application-id
117+
echo "${TEST_GITHUB_SECOND_WEBHOOK_SECRET}" >~/second/webhook.secret
118+
echo "${TEST_GITHUB_SECOND_SMEE_URL}" >~/second/smee
119+
120+
go install github.com/jsha/minica@latest
121+
122+
(
123+
cd ${HOME}/startpaac
124+
if [[ ${TEST_PROVIDER} == "providers" ]]; then
125+
./startpaac --all-github-second-no-forgejo
126+
else
127+
./startpaac --all
128+
fi
129+
)
130+
131+
echo "**********************************************************************"
132+
echo "Copying minica CA certs to /usr/local/share/ca-certificates/minica.crt"
133+
echo "**********************************************************************"
134+
sudo cp -v /tmp/certs/minica.pem /usr/local/share/ca-certificates/minica.crt
135+
sudo update-ca-certificates
136+
}
137+
94138
collect_logs() {
95139
# Read from environment variables
96140
local test_gitea_smee_url="${TEST_GITEA_SMEEURL}"
@@ -157,6 +201,10 @@ help() {
157201
collect_logs
158202
Collect logs from the cluster
159203
Required env vars: TEST_GITEA_SMEEURL, TEST_GITHUB_SECOND_SMEE_URL
204+
205+
startpaac
206+
Install startpaac and setup the config
207+
Required env vars: PAC_GITHUB_PRIVATE_KEY, PAC_GITHUB_APPLICATION_ID, PAC_WEBHOOK_SECRET, PAC_SMEE_URL
160208
EOF
161209
}
162210

@@ -173,6 +221,9 @@ run_e2e_tests)
173221
collect_logs)
174222
collect_logs
175223
;;
224+
startpaac)
225+
startpaac
226+
;;
176227
help)
177228
help
178229
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)