Skip to content

Commit

Permalink
Use citool from CTF
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaszcl committed Aug 14, 2024
1 parent 1ca63e7 commit e071310
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 995 deletions.
1 change: 0 additions & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ jobs:
echo "$test_results" | jq .
node_migration_tests_failed=$(echo $test_results | jq '[.[] | select(.id == "integration-tests/migration/upgrade_version_test.go:*" ) | select(.result != "success")] | length > 0')
echo "node_migration_tests_failed=$node_migration_tests_failed"
echo "node_migration_tests_failed=$node_migration_tests_failed" >> $GITHUB_OUTPUT
- name: Send slack notification for failed migration tests
Expand Down
36 changes: 25 additions & 11 deletions .github/workflows/run-e2e-tests-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,23 @@ jobs:
needs: validate-inputs
runs-on: ubuntu-latest
steps:
- name: Checkout code
- name: Checkout core
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Setup Go
uses: ./.github/actions/setup-go
with:
fetch-depth: 0
path: core
- name: Checkout chainlink-testing-framework to use citool
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
repository: smartcontractkit/chainlink-testing-framework
ref: main
fetch-depth: 0
path: ctf
# - name: Setup Go
# uses: ./.github/actions/setup-go
- name: Run Check Tests Command
run: |
cd integration-tests/
if ! go run citool/main.go check-tests . ../.github/e2e-tests.yml; then
if ! go run ctf/tools/citool/main.go check-tests core/integration-tests core/.github/e2e-tests.yml; then
echo "::error::Some E2E test configurations have to be added to .github/e2e-tests.yml. This file defines Github CI configuration for each E2E test or set of E2E tests." && exit 1
fi
Expand Down Expand Up @@ -221,23 +230,28 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Setup Go
uses: ./.github/actions/setup-go
- name: Checkout chainlink-testing-framework to use citool
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
repository: smartcontractkit/chainlink-testing-framework
ref: main
fetch-depth: 0
path: ctf
# - name: Setup Go
# uses: ./.github/actions/setup-go
- name: Install jq
run: sudo apt-get install jq
- name: Generate Docker Tests Matrix
id: set-docker-matrix
run: |
cd integration-tests/citool
MATRIX_JSON=$(go run main.go filter --file ${{ github.workspace }}/.github/e2e-tests.yml --test-env-type 'docker' --test-list '${{ inputs.test_list }}' --test-ids '${{ inputs.test_ids }}' --workflow '${{ inputs.test_workflow }}')
MATRIX_JSON=$(go run ctf/tools/citool/main.go filter --file ${{ github.workspace }}/.github/e2e-tests.yml --test-env-type 'docker' --test-list '${{ inputs.test_list }}' --test-ids '${{ inputs.test_ids }}' --workflow '${{ inputs.test_workflow }}')
echo "Docker tests:"
echo "$MATRIX_JSON" | jq
echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
- name: Generate K8s Tests Matrix
id: set-k8s-runner-matrix
run: |
cd integration-tests/citool
MATRIX_JSON=$(go run main.go filter --file ${{ github.workspace }}/.github/e2e-tests.yml --test-env-type 'k8s-remote-runner' --test-list '${{ inputs.test_list }}' --test-ids '${{ inputs.test_ids }}' --workflow '${{ inputs.test_workflow }}')
MATRIX_JSON=$(go run ctf/tools/citool/main.go filter --file ${{ github.workspace }}/.github/e2e-tests.yml --test-env-type 'k8s-remote-runner' --test-list '${{ inputs.test_list }}' --test-ids '${{ inputs.test_ids }}' --workflow '${{ inputs.test_workflow }}')
echo "K8s tests:"
echo "$MATRIX_JSON" | jq
echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ db_dumps/
integration-tests/**/traces/
benchmark_report.csv
benchmark_summary.json
integration-tests/citool/output.csv

# goreleaser builds
cosign.*
Expand Down
166 changes: 0 additions & 166 deletions integration-tests/citool/cmd/check_tests_cmd.go

This file was deleted.

47 changes: 0 additions & 47 deletions integration-tests/citool/cmd/check_tests_cmd_test.go

This file was deleted.

Loading

0 comments on commit e071310

Please sign in to comment.