Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: replace prow build job waiting with github action #433

Merged
merged 5 commits into from
Sep 18, 2024
+174 −121
Merged

chore: replace prow build job waiting with github action #433

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad0e662
replace prow build job waiting with github action
mfaizanse Sep 17, 2024
c8d2377
updated
mfaizanse Sep 17, 2024
375c3c0
updated
mfaizanse Sep 17, 2024
de284ec
updated
mfaizanse Sep 17, 2024
143eb47
updated
mfaizanse Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 41 additions & 5 deletions .github/workflows/create-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GIT_BOT_TOKEN }} # creating git tag using bot token because GITHUB_TOKEN would not trigger build workflow (https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow).

- name: Create changelog
env:
Expand All @@ -54,14 +55,13 @@ jobs:
RELEASE_ID=$(./.github/scripts/create_draft_release.sh ${{ github.event.inputs.version }}) # this will use the CHANGELOG.md from the step 'Create changelog'
echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT
- name: Trigger 'release-nats-manager-build' prow job
- name: Add lightweight tag to trigger release build job
env:
GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }} # creating git tag using bot token because GITHUB_TOKEN would not trigger build workflow (https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow).
run: |
git tag ${{ github.event.inputs.version }}
git push origin ${{ github.event.inputs.version }}
- name: Wait for 'release-nats-manager-build'
run: ./.github/scripts/check-prow-build-job.sh ${{ github.ref_name }} 600 10 30

- name: Create and upload nats-manager.yaml and nats-default-cr.yaml
env:
KUSTOMIZE_VERSION: "v4.5.6"
Expand All @@ -71,9 +71,45 @@ jobs:
outputs:
release_id: ${{ steps.create-draft.outputs.release_id }}

wait-for-build-job:
name: Wait for build job
needs: [ create-draft ]
runs-on: ubuntu-latest

steps:
- name: Checkout eventing-tools
uses: actions/checkout@v4
with:
repository: 'kyma-project/eventing-tools'
path: 'kyma-project/eventing-tools'
ref: main
sparse-checkout: 'scripts/wait-for-commit-check'

- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'

- name: Install requirements
run: |
pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt
- name: wait for build
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager
GIT_REF: ${{ github.event.inputs.version }}
# The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name.
GIT_CHECK_RUN_NAME: "build-${{ github.event.inputs.version }} / Build image"
INTERVAL: 60
TIMEOUT: 900
run: |
python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py
publish-release:
name: Publish release
needs: [verify-release-status, create-draft]
needs: [verify-release-status, create-draft, wait-for-build-job]
runs-on: ubuntu-latest

steps:
Expand Down
112 changes: 97 additions & 15 deletions .github/workflows/pull-e2e-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,44 @@ on:
- "sec-scanners-config.yaml"

jobs:
wait-for-build-job:
name: Wait for build job
runs-on: ubuntu-latest

steps:
- name: Checkout eventing-tools
uses: actions/checkout@v4
with:
repository: 'kyma-project/eventing-tools'
path: 'kyma-project/eventing-tools'
ref: main
sparse-checkout: 'scripts/wait-for-commit-check'

- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'

- name: Install requirements
run: |
pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt
- name: Wait for build job
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager
GIT_REF: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests.
# The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name.
GIT_CHECK_RUN_NAME: "build / Build image"
INTERVAL: 60
TIMEOUT: 900
run: |
python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py
e2e:
name: e2e
needs: [ wait-for-build-job ]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -45,19 +82,6 @@ jobs:
run: |
make install IMG=$DOCKER_IMAGE
- name: Wait for the 'pull-nats-manager-build' job to succeed
uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20
with:
context: "pull-nats-manager-build"
commit_ref: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests.
timeout: 600000 # 10 minutes in milliseconds
# The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting)
check_interval: 60000 # 1 minute in milliseconds
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
GITHUB_OWNER: "${{ github.repository_owner }}"
GITHUB_REPO: "nats-manager"

- name: Create kyma-system namespace
run: |
kubectl create namespace kyma-system
Expand Down Expand Up @@ -116,5 +140,63 @@ jobs:
run: |
kubectl get nats --all-namespaces
# references:
# wait for other gh checks to finish: https://github.com/marketplace/actions/wait-for-check
e2e-upgrade: # This job tests the upgrade of NATS module from latest image of the main branch to the current commit.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this job from .github/workflows/pull-e2e-upgrade-test.yaml.

name: e2e-upgrade
needs: [ wait-for-build-job ]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Cache Go dependencies
uses: actions/setup-go@v5
with:
go-version-file: "./go.mod"
check-latest: true
cache-dependency-path: "./go.sum"

- run: go version

- name: Install k3d tools
run: |
make -C hack/ci/ install-k3d-tools
- name: Install Kyma CLI & setup k3d cluster using kyma CLI
run: |
make kyma
make -C hack/ci/ create-k3d
kubectl version
kubectl cluster-info
- name: Install latest NATS manager from main branch
run: |
make -C hack/ci/ create-kyma-system-ns
make deploy IMG=europe-docker.pkg.dev/kyma-project/prod/nats-manager:main
- name: Setup & test NATS CR
run: |
make e2e-setup
- name: Install the new NATS manager from current commit
run: |
make deploy IMG=${DOCKER_IMAGE}
- name: Wait for new changes to be reflected
# Waits for NATS-manager image to be updated and NATS CR readiness.
run: |
export MANAGER_IMAGE=${DOCKER_IMAGE}
make e2e-setup
- name: Run NATS bench
run: |
go install github.com/nats-io/natscli/nats@latest
export PATH=$HOME/go/bin:$PATH
make e2e-bench
- name: Test NATS-server
run: |
make e2e-nats-server
- name: Cleanup NATS CR
run: |
make e2e-cleanup
88 changes: 0 additions & 88 deletions .github/workflows/pull-e2e-upgrade-test.yaml
View file
Open in desktop

This file was deleted.

37 changes: 27 additions & 10 deletions .github/workflows/push-e2e-upgrade-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,35 @@ jobs:
run: |
make e2e-setup

- name: Wait for the 'post-nats-manager-build' job to succeed
uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20
- name: Wait for build job - Checkout eventing-tools
uses: actions/checkout@v4
with:
repository: 'kyma-project/eventing-tools'
path: 'kyma-project/eventing-tools'
ref: main
sparse-checkout: 'scripts/wait-for-commit-check'

- name: Wait for build job - Setup python
uses: actions/setup-python@v5
with:
context: "post-nats-manager-build"
commit_ref: "${{ github.sha }}"
timeout: 600000 # 10 minutes in milliseconds
# The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting)
check_interval: 60000 # 1 minute in milliseconds
python-version: '3.10'
cache: 'pip'

- name: Wait for build job - Install requirements
run: |
pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt

- name: Wait for build job
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
GITHUB_OWNER: "${{ github.repository_owner }}"
GITHUB_REPO: "nats-manager"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager
GIT_REF: "${{ github.sha }}"
# The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name.
GIT_CHECK_RUN_NAME: "build / Build image"
INTERVAL: 60
TIMEOUT: 900
run: |
python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py

- name: Install the new NATS manager from current commit
env:
Expand Down
Loading