From 07f534a3850bc0c4fa0c9c3985a7790277edcb27 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Wed, 3 Jul 2024 10:45:03 -0700 Subject: [PATCH] all profile and .env for defaults --- .github/workflows/e2e.yml | 3 - .github/workflows/execute_advanced_tests.yaml | 106 ------------------ Makefile | 6 +- contrib/localnet/docker-compose.yml | 7 ++ 4 files changed, 8 insertions(+), 114 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 361b52a96f..af85975403 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -44,9 +44,6 @@ jobs: if [[ "$labels" == *"ADMIN_TESTS"* ]]; then echo "ADMIN_TESTS=true" >> $GITHUB_OUTPUT fi - elif [[ ${{ github.event_name }} == 'merge_group' ]]; then - #TODO: add ability to opt out via MINIMAL_TESTS - echo "UPGRADE_LIGHT_TESTS=true" >> $GITHUB_OUTPUT elif [[ ${{ github.event_name }} == 'schedule' ]]; then echo "UPGRADE_TESTS=true" >> $GITHUB_OUTPUT echo "UPGRADE_LIGHT_TESTS=true" >> $GITHUB_OUTPUT diff --git a/.github/workflows/execute_advanced_tests.yaml b/.github/workflows/execute_advanced_tests.yaml index 77d6a2b6bd..e8a4683812 100644 --- a/.github/workflows/execute_advanced_tests.yaml +++ b/.github/workflows/execute_advanced_tests.yaml @@ -3,14 +3,6 @@ name: "TESTING:ADVANCED:E2E" on: workflow_dispatch: inputs: - e2e-admin-tests: - type: boolean - required: false - default: false - e2e-upgrade-test: - type: boolean - required: false - default: false e2e-stateful-upgrade-test: type: boolean required: false @@ -19,10 +11,6 @@ on: type: boolean required: false default: false - e2e-upgrade-test-light: - type: boolean - required: false - default: false e2e-stateful-data-test: type: boolean required: false @@ -37,69 +25,6 @@ on: - cron: "0 6 * * *" jobs: - e2e-admin-tests: - if: ${{ github.event.inputs.e2e-admin-tests == 'true' || github.event_name == 'schedule' }} - runs-on: buildjet-4vcpu-ubuntu-2204 - timeout-minutes: 120 - steps: - - name: "Checkout Code" - uses: actions/checkout@v4 - - - name: Start Test - run: make start-e2e-admin-test - - # use docker logs -f rather than docker attach to make sure we get the initial logs - - name: Watch Test - run: | - container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}") - docker logs -f "${container_id}" & - exit $(docker wait "${container_id}") - - - name: Full Log Dump On Failure - if: failure() - run: | - make stop-localnet - - - name: Notify Slack on Failure - if: failure() && github.event_name == 'schedule' - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,author,action,eventName,ref,workflow,job,took - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_CI_ALERTS }} - - e2e-upgrade-test: - if: ${{ github.event.inputs.e2e-upgrade-test == 'true' || github.event_name == 'schedule' }} - runs-on: buildjet-16vcpu-ubuntu-2204 - timeout-minutes: 120 - steps: - - name: "Checkout Code" - uses: actions/checkout@v4 - - - name: Start Test - run: make start-upgrade-test - - - name: Watch Test - run: | - container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}") - docker logs -f "${container_id}" & - exit $(docker wait "${container_id}") - - - name: Full Log Dump On Failure - if: failure() - run: | - make stop-localnet - - - name: Notify Slack on Failure - if: failure() && github.event_name == 'schedule' - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,author,action,eventName,ref,workflow,job,took - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_CI_ALERTS }} - e2e-stateful-upgrade-test: if: ${{ github.event.inputs.e2e-stateful-upgrade-test == 'true' || github.event_name == 'schedule' }} runs-on: buildjet-16vcpu-ubuntu-2204 @@ -131,37 +56,6 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_CI_ALERTS }} - 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" - uses: actions/checkout@v4 - - - name: Start Test - run: make start-upgrade-test-light - - - name: Watch Test - run: | - container_id=$(docker ps --filter "ancestor=orchestrator:latest" --format "{{.ID}}") - docker logs -f "${container_id}" & - exit $(docker wait "${container_id}") - - - name: Full Log Dump On Failure - if: failure() - run: | - make stop-localnet - - - name: Notify Slack on Failure - if: failure() && github.event_name == 'schedule' - uses: 8398a7/action-slack@v3 - with: - status: ${{ job.status }} - fields: repo,message,commit,author,action,eventName,ref,workflow,job,took - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_CI_ALERTS }} - e2e-performance-test: if: ${{ github.event.inputs.e2e-performance-test == 'true' }} runs-on: buildjet-4vcpu-ubuntu-2204 diff --git a/Makefile b/Makefile index 6fd58f0484..81a7220c2d 100644 --- a/Makefile +++ b/Makefile @@ -28,11 +28,7 @@ export DOCKER_BUILDKIT := 1 # parameters for localnet docker compose files # set defaults to empty to prevent docker warning -export LOCALNET_MODE export E2E_ARGS := $(E2E_ARGS) -export UPGRADE_HEIGHT -export ZETACORED_IMPORT_GENESIS_DATA -export ZETACORED_START_PERIOD := 30s clean: clean-binaries clean-dir clean-test-dir clean-coverage @@ -217,7 +213,7 @@ start-localnet-skip-build: # stop-localnet should include all profiles so other containers are also removed stop-localnet: - cd contrib/localnet/ && $(DOCKER) compose --profile eth2 --profile stress --profile upgrade down --remove-orphans + cd contrib/localnet/ && $(DOCKER) compose --profile all --remove-orphans ############################################################################### ### E2E tests ### diff --git a/contrib/localnet/docker-compose.yml b/contrib/localnet/docker-compose.yml index cbfc17ff0f..a7dbadd9ea 100644 --- a/contrib/localnet/docker-compose.yml +++ b/contrib/localnet/docker-compose.yml @@ -84,6 +84,7 @@ services: hostname: zetacore2 profiles: - stress + - all networks: mynetwork: ipv4_address: 172.20.0.13 @@ -100,6 +101,7 @@ services: hostname: zetacore3 profiles: - stress + - all networks: mynetwork: ipv4_address: 172.20.0.14 @@ -148,6 +150,7 @@ services: hostname: zetaclient2 profiles: - stress + - all networks: mynetwork: ipv4_address: 172.20.0.23 @@ -165,6 +168,7 @@ services: hostname: zetaclient3 profiles: - stress + - all networks: mynetwork: ipv4_address: 172.20.0.24 @@ -194,6 +198,7 @@ services: hostname: eth2 profiles: - eth2 + - all platform: linux/amd64 ports: - "8546:8545" @@ -245,6 +250,7 @@ services: hostname: upgrade-host profiles: - upgrade + - all entrypoint: ["/root/start-upgrade-host.sh"] networks: mynetwork: @@ -259,6 +265,7 @@ services: hostname: upgrade-orchestrator profiles: - upgrade + - all entrypoint: ["/root/start-upgrade-orchestrator.sh"] networks: mynetwork: