Skip to content

Commit 01f061c

Browse files
maru-avaJonathanOppenheimer
authored andcommitted
[ci] Remove use of run_env with run-monitored-tmpnet-cmd (#1252)
1 parent d960769 commit 01f061c

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,10 @@ jobs:
9999
- uses: actions/setup-go@v5
100100
with:
101101
go-version-file: "go.mod"
102-
- name: Build AvalancheGo and update Coreth dependency
103-
run: ./scripts/run_task.sh build-avalanchego-with-coreth
104102
- name: Run e2e tests
105103
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@cc3242f48a6262c52057e98a85d6cf8184dfaca3
106104
with:
107-
run: ./scripts/run_task.sh test-e2e
108-
run_env: AVALANCHEGO_CLONE_PATH=avalanchego
105+
run: ./scripts/run_task.sh test-e2e-ci
109106
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
110107
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
111108
loki_username: ${{ secrets.LOKI_ID || '' }}
@@ -130,18 +127,10 @@ jobs:
130127
repository: ${{ github.event.inputs.avalanchegoRepo }}
131128
ref: ${{ github.event.inputs.avalanchegoBranch }}
132129
path: avalanchego
133-
- name: Move AvalancheGo
134-
if: ${{ github.event_name == 'workflow_dispatch' }}
135-
run: mv avalanchego /tmp/e2e/warp/avalanchego
136-
- name: Build AvalancheGo and update Coreth dependency
137-
run: ./scripts/run_task.sh build-avalanchego-with-coreth
138-
env:
139-
AVALANCHEGO_CLONE_PATH: /tmp/e2e/warp/avalanchego
140130
- name: Run Warp E2E Tests
141131
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@cc3242f48a6262c52057e98a85d6cf8184dfaca3
142132
with:
143133
run: ./scripts/run_task.sh test-e2e-warp-ci
144-
run_env: AVALANCHEGO_BUILD_PATH=/tmp/e2e/warp/avalanchego/build
145134
artifact_prefix: warp
146135
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
147136
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}

Taskfile.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
version: '3'
66

77
env:
8-
BASEDIR: '{{.BASEDIR | default "/tmp/e2e-test"}}'
9-
AVALANCHEGO_BUILD_PATH: '{{.AVALANCHEGO_BUILD_PATH | default "/tmp/e2e-test/avalanchego"}}'
10-
DATA_DIR: '{{.DATA_DIR | default "/tmp/e2e-test/coreth-data"}}'
8+
AVALANCHEGO_BUILD_PATH: '{{.AVALANCHEGO_BUILD_PATH | default (printf "%s/avalanchego/build" .TASKFILE_DIR) }}'
119

1210
tasks:
1311
default: ./scripts/run_task.sh --list
@@ -120,16 +118,23 @@ tasks:
120118
desc: Run AvalancheGo e2e tests from target version against current state of coreth
121119
cmd: ./scripts/tests.e2e.sh # ci.yml
122120

121+
test-e2e-ci:
122+
desc: Run AvalancheGo e2e tests from target version against current state of coreth, cloning and building avalanchego if necessary
123+
cmds:
124+
- task: build-avalanchego-with-coreth
125+
- task: test-e2e
126+
123127
test-e2e-warp:
124128
desc: Run end-to-end warp tests using Ginkgo test framework
125-
cmd: ./scripts/run_ginkgo_warp.sh # ci.yml
129+
cmd: bash -x ./scripts/run_ginkgo_warp.sh # ci.yml
126130

127131
test-e2e-warp-ci: # consolidated test-e2e-warp
128132
desc: Run E2E warp tests with CI setup
129133
cmds:
134+
- task: build-avalanchego-with-coreth
130135
- task: build
131136
- task: test-e2e-warp
132137

133138
update-avalanchego-version:
134139
desc: Update AvalancheGo version in go.mod and sync GitHub Actions workflow custom action version
135-
cmd: bash -x ./scripts/update_avalanchego_version.sh # ci.yml
140+
cmd: bash -x ./scripts/update_avalanchego_version.sh # ci.yml

0 commit comments

Comments
 (0)