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

Jump to bottom

fix: update advanced testing pipeline to not execute tests that weren't selected so they show skipped instead of skipping steps. #1945

Merged
merged 12 commits into from
Mar 26, 2024
Merged

fix: update advanced testing pipeline to not execute tests that weren't selected so they show skipped instead of skipping steps. #1945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6093fcd
fix:update advanced testing pipeline to not execute tests that weren'…
gzukel Mar 25, 2024
48995fc
adding while loop
gzukel Mar 26, 2024
ea6bdc0
adding while loop
gzukel Mar 26, 2024
56e5067
adding while loop
gzukel Mar 26, 2024
56c46a5
adding while loop
gzukel Mar 26, 2024
6f49cb2
adding while loop
gzukel Mar 26, 2024
fea5733
adding while loop
gzukel Mar 26, 2024
29621b0
adding while loop
gzukel Mar 26, 2024
00f7838
adding while loop
gzukel Mar 26, 2024
90f688c
testing updates
gzukel Mar 26, 2024
1515ba4
change upgrade test height to 225
lumtis Mar 26, 2024
78bf9f9
Merge branch 'develop' into modify-advance-test-skip-to-show-skipped
gzukel Mar 26, 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
120 changes: 112 additions & 8 deletions .github/workflows/execute_advanced_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,60 +19,164 @@ on:
type: boolean
required: false
default: false
debug:
type: boolean
required: false
default: false

jobs:
e2e-admin-tests:
if: ${{ github.event.inputs.e2e-admin-tests == 'true' }}
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 120
steps:
- name: "Checkout Code"
if: ${{ github.event.inputs.e2e-admin-tests == 'true' }}
uses: actions/checkout@v3

- name: Execute e2e-admin-tests
if: ${{ github.event.inputs.e2e-admin-tests == 'true' }}
shell: bash
run: |
make start-e2e-admin-test
container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}")
if [ -z "$container_id" ]; then
echo "Orchestrator container is not currently running. Exiting..."
exit 1
fi
echo "Monitoring Orchestrator container with ID: $container_id"
while true; do
current_status=$(docker ps -q | grep $container_id || echo "docker-ps-error")
if [ "$current_status" == "docker-ps-error" ]; then
echo "***********************************"
echo "* *"
echo "* *"
echo "* TESTING COMPLETE *"
echo "* *"
echo "* *"
echo "***********************************"
docker logs $container_id || echo "no logs"
exit 0
else
echo "Testing in progress still...."
if [ "${{ github.event.inputs.e2e-upgrade-test }}" == "true" ]; then
docker logs $container_id || echo "no logs"
fi
fi
sleep 5
done

e2e-upgrade-test:
if: ${{ github.event.inputs.e2e-upgrade-test == 'true' }}
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 120
steps:
- name: "Checkout Code"
if: ${{ github.event.inputs.e2e-upgrade-test == 'true' }}
uses: actions/checkout@v3

- name: Execute upgrade-test
if: ${{ github.event.inputs.e2e-upgrade-test == 'true' }}
shell: bash
run: |
make start-upgrade-test
container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}")
if [ -z "$container_id" ]; then
echo "Orchestrator container is not currently running. Exiting..."
exit 1
fi
echo "Monitoring Orchestrator container with ID: $container_id"
while true; do
current_status=$(docker ps -q | grep $container_id || echo "docker-ps-error")
if [ "$current_status" == "docker-ps-error" ]; then
echo "***********************************"
echo "* *"
echo "* *"
echo "* TESTING COMPLETE *"
echo "* *"
echo "* *"
echo "***********************************"
docker logs $container_id || echo "no logs"
exit 0
else
echo "Testing in progress still...."
if [ "${{ github.event.inputs.e2e-upgrade-test }}" == "true" ]; then
docker logs $container_id || echo "no logs"
fi
fi
sleep 5
done

e2e-upgrade-test-light:
if: ${{ github.event.inputs.e2e-upgrade-test-light == 'true' }}
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 120
steps:
- name: "Checkout Code"
if: ${{ github.event.inputs.e2e-upgrade-test-light == 'true' }}
uses: actions/checkout@v3

- name: Execute upgrade-test-light
if: ${{ github.event.inputs.e2e-upgrade-test-light == 'true' }}
shell: bash
run: |
make start-upgrade-test-light
container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}")
if [ -z "$container_id" ]; then
echo "Orchestrator container is not currently running. Exiting..."
exit 1
fi
echo "Monitoring Orchestrator container with ID: $container_id"
while true; do
current_status=$(docker ps -q | grep $container_id || echo "docker-ps-error")
if [ "$current_status" == "docker-ps-error" ]; then
echo "***********************************"
echo "* *"
echo "* *"
echo "* TESTING COMPLETE *"
echo "* *"
echo "* *"
echo "***********************************"
docker logs $container_id || echo "no logs"
exit 0
else
echo "Testing in progress still...."
if [ "${{ github.event.inputs.e2e-upgrade-test }}" == "true" ]; then
docker logs $container_id || echo "no logs"
fi
fi
sleep 5
done

e2e-performance-test:
if: ${{ github.event.inputs.e2e-performance-test == 'true' }}
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 120
steps:
- name: "Checkout Code"
if: ${{ github.event.inputs.e2e-performance-test == 'true' }}
uses: actions/checkout@v3

- name: Execute Performance Tests
if: ${{ github.event.inputs.e2e-performance-test == 'true' }}
shell: bash
run: |
make start-e2e-performance-test
container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}")
if [ -z "$container_id" ]; then
echo "Orchestrator container is not currently running. Exiting..."
exit 1
fi
echo "Monitoring Orchestrator container with ID: $container_id"
while true; do
current_status=$(docker ps -q | grep $container_id || echo "docker-ps-error")
if [ "$current_status" == "docker-ps-error" ]; then
echo "***********************************"
echo "* *"
echo "* *"
echo "* TESTING COMPLETE *"
echo "* *"
echo "* *"
echo "***********************************"
docker logs $container_id || echo "no logs"
exit 0
else
echo "Testing in progress still...."
if [ "${{ github.event.inputs.e2e-upgrade-test }}" == "true" ]; then
docker logs $container_id || echo "no logs"
fi
fi
sleep 5
done
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
* [1814](https://github.com/zeta-chain/node/pull/1814) - fix code coverage ignore for protobuf generated files

### CI
* [1945](https://github.com/zeta-chain/node/pull/1945) - update advanced testing pipeline to not execute tests that weren't selected so they show skipped instead of skipping steps.
* [1940](https://github.com/zeta-chain/node/pull/1940) - adjust release pipeline to be created as pre-release instead of latest
* [1867](https://github.com/zeta-chain/node/pull/1867) - default restore_type for full node docker-compose to snapshot instead of statesync for reliability.
* [1891](https://github.com/zeta-chain/node/pull/1891) - fix typo that was introduced to docker-compose and a typo in start.sh for the docker start script for full nodes.
Expand Down
4 changes: 2 additions & 2 deletions contrib/localnet/orchestrator/start-zetae2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ if [ "$OPTION" == "upgrade" ]; then

# Run the e2e tests, then restart zetaclientd at upgrade height and run the e2e tests again

# Fetch the height of the upgrade, default is 200, if arg3 is passed, use that value
UPGRADE_HEIGHT=${3:-200}
# Fetch the height of the upgrade, default is 225, if arg3 is passed, use that value
UPGRADE_HEIGHT=${3:-225}

# Run zetae2e, if the upgrade height is lower than 100, we use the setup-only flag
if [ "$UPGRADE_HEIGHT" -lt 100 ]; then
Expand Down
4 changes: 2 additions & 2 deletions contrib/localnet/scripts/start-zetacored.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ else
sleep 20
echo

# Fetch the height of the upgrade, default is 200, if arg3 is passed, use that value
UPGRADE_HEIGHT=${3:-200}
# Fetch the height of the upgrade, default is 225, if arg3 is passed, use that value
UPGRADE_HEIGHT=${3:-225}

# If this is the first node, create a governance proposal for upgrade
if [ $HOSTNAME = "zetacore0" ]
Expand Down
Loading