Skip to content

Commit

Permalink
QA-94 Dynamically use the latest chainlink/integration-tests libs to …
Browse files Browse the repository at this point in the history
…keep us compatible (#424)
  • Loading branch information
tateexon committed Nov 8, 2022
1 parent feefad3 commit 9eb6060
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 197 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build_contract_artifacts/action.yml
Expand Up @@ -17,7 +17,7 @@ runs:
apt update
apt install git -y
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
with:
repository: smartcontractkit/chainlink-solana
ref: ${{ inputs.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0

- name: Set up Go
uses: actions/setup-go@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contract-release.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
projectserum_version: ${{ steps.psversion.outputs.projectserum_version }}
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Get ProjectSerum Version
id: psversion
uses: ./.github/actions/projectserum_version
Expand All @@ -29,7 +29,7 @@ jobs:
env:
RUSTUP_HOME: "/root/.rustup"
steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Build Artifacts
run: anchor build
- name: Generate archive
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/e2e_custom_cl.yml
Expand Up @@ -23,7 +23,7 @@ jobs:
projectserum_version: ${{ steps.psversion.outputs.projectserum_version }}
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Get ProjectSerum Version
id: psversion
uses: ./.github/actions/projectserum_version
Expand All @@ -42,7 +42,7 @@ jobs:
FORCE_COLOR: 1
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Build contracts
uses: ./.github/actions/build_contract_artifacts
e2e_custom_build_custom_chainlink_image:
Expand All @@ -54,7 +54,7 @@ jobs:
contents: read
steps:
- name: Build Image
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@cd9e407a6e0aa8ef7f315067644c0333846ffd40 # v2.0.24
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25
with:
cl_repo: smartcontractkit/chainlink
# by default we are integrating with develop
Expand Down Expand Up @@ -82,9 +82,9 @@ jobs:
TEST_LOG_LEVEL: debug
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Run Tests
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@cd9e407a6e0aa8ef7f315067644c0333846ffd40 # v2.0.24
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25
with:
test_command_to_run: make test_smoke
go_mod_path: ./tests/go.mod
Expand All @@ -94,12 +94,12 @@ jobs:
artifacts_location: /home/runner/work/chainlink-solana/chainlink-solana/tests/e2e/logs
token: ${{ secrets.GITHUB_TOKEN }}
triggered_by: ${{ env.TEST_TRIGGERED_BY }}
dep_chainlink_integration_tests: ${{ github.event.inputs.cl_branch_ref || 'develop' }}
QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
CGO_ENABLED: "1"
- name: cleanup
if: always()
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/cleanup@cd9e407a6e0aa8ef7f315067644c0333846ffd40 # v2.0.24
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/cleanup@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25
with:
triggered_by: ${{ env.TEST_TRIGGERED_BY }}
8 changes: 4 additions & 4 deletions .github/workflows/gauntlet.yml
Expand Up @@ -10,7 +10,7 @@ jobs:
outputs:
nodejs_version: ${{ steps.tool-versions.outputs.nodejs_version }}
steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- uses: smartcontractkit/tool-versions-to-env-action@v1.0.8
id: tool-versions

Expand All @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
needs: [tool_versions]
steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }}
uses: actions/setup-node@v2
with:
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
needs: [tool_versions]
steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }}
uses: actions/setup-node@v2
with:
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
needs: [tool_versions]
steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }}
uses: actions/setup-node@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- uses: smartcontractkit/tool-versions-to-env-action@v1.0.8
id: tool-versions
- name: Setup Go
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-gh-workflows.yml
Expand Up @@ -7,6 +7,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Code
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Run actionlint
uses: reviewdog/action-actionlint@c5d7b203340dfcb0f18fdf2ea44b0c10a1dee012 # v1.33.0
uses: reviewdog/action-actionlint@7556c222a14ff4583c0f772caeb7f65bb3816dc1 # v1.34.0
2 changes: 1 addition & 1 deletion .github/workflows/relay.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Setup go
uses: actions/setup-go@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
projectserum_version: ${{ steps.psversion.outputs.projectserum_version }}
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Get ProjectSerum Version
id: psversion
uses: ./.github/actions/projectserum_version
Expand All @@ -30,7 +30,7 @@ jobs:
FORCE_COLOR: 1

steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Cache cargo registry
uses: actions/cache@v2.1.7
with:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
FORCE_COLOR: 1

steps:
- uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Cache cargo registry
uses: actions/cache@v2.1.7
with:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/soak.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
projectserum_version: ${{ steps.psversion.outputs.projectserum_version }}
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Get ProjectSerum Version
id: psversion
uses: ./.github/actions/projectserum_version
Expand All @@ -37,7 +37,7 @@ jobs:
FORCE_COLOR: 1
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Build contracts
uses: ./.github/actions/build_contract_artifacts
soak_testing_build_custom_chainlink_image:
Expand All @@ -49,7 +49,7 @@ jobs:
contents: read
steps:
- name: Build Image
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@cd9e407a6e0aa8ef7f315067644c0333846ffd40 # v2.0.24
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25
with:
cl_repo: smartcontractkit/chainlink
# by default we are integrating with develop
Expand Down Expand Up @@ -77,9 +77,9 @@ jobs:
TEST_LOG_LEVEL: debug
steps:
- name: Checkout the repo
uses: actions/checkout@f25a3a9f25bd5f4c5d77189cab02ff357b5aedeb # v2.4.1
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Run Tests
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@cd9e407a6e0aa8ef7f315067644c0333846ffd40 # v2.0.24
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5ca2b0a07d534f216fb97ab54e69d3fdcf03de11 # v2.0.25
with:
test_command_to_run: make test_ocr_soak
go_mod_path: ./tests/go.mod
Expand All @@ -91,6 +91,7 @@ jobs:
publish_check_name: Chaos Test Results
token: ${{ secrets.GITHUB_TOKEN }}
triggered_by: ${{ env.TEST_TRIGGERED_BY }}
dep_chainlink_integration_tests: develop
QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -39,3 +39,5 @@ id.json
tests/e2e/logs
tests/e2e/smoke/logs
tests/e2e/smoke/contracts-chaos-state.json
tmp-manifest-*
tests-smoke-report.xml
5 changes: 3 additions & 2 deletions .tool-versions
@@ -1,9 +1,10 @@
nodejs 14.19.1
rust 1.59.0
golang 1.19.2
golang 1.19.3
golangci-lint 1.45.2
pulumi 3.40.1
ginkgo 2.4.0
actionlint 1.6.19
actionlint 1.6.22
shellcheck 0.8.0
helm 3.9.4
kubectl 1.25.3
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -37,6 +37,7 @@ ifeq ($(OSFLAG),$(OSX))
asdf plugin-add pulumi || true
asdf plugin add actionlint || true
asdf plugin add shellcheck || true
asdf plugin add kubectl || true
asdf install
endif
ifeq ($(OSFLAG),$(LINUX))
Expand Down
42 changes: 23 additions & 19 deletions tests/go.mod
Expand Up @@ -10,17 +10,17 @@ require (
github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27
github.com/lib/pq v1.10.7
github.com/onsi/ginkgo/v2 v2.4.0
github.com/onsi/gomega v1.22.1
github.com/onsi/gomega v1.23.0
github.com/rs/zerolog v1.28.0
github.com/satori/go.uuid v1.2.0
github.com/smartcontractkit/chainlink v1.9.0
github.com/smartcontractkit/chainlink-env v0.2.46
github.com/smartcontractkit/chainlink-env v0.2.50
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20221027174234-50b4d94d7135
github.com/smartcontractkit/chainlink-testing-framework v1.7.5
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221028172530-e7956f167e9b
github.com/smartcontractkit/chainlink-testing-framework v1.7.10
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20221108194954-9075d1844d90
github.com/smartcontractkit/libocr v0.0.0-20220812191430-db92a9fdaa52
golang.org/x/crypto v0.1.0
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
golang.org/x/sync v0.1.0
gopkg.in/guregu/null.v4 v4.0.0
)

Expand All @@ -39,7 +39,7 @@ require (
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
github.com/armon/go-metrics v0.3.10 // indirect
github.com/aws/constructs-go/constructs/v10 v10.1.138 // indirect
github.com/aws/constructs-go/constructs/v10 v10.1.145 // indirect
github.com/aws/jsii-runtime-go v1.70.0 // indirect
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
github.com/benbjohnson/clock v1.1.0 // indirect
Expand All @@ -50,10 +50,10 @@ require (
github.com/btcsuite/btcd v0.23.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.5.26 // indirect
github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.5.33 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/chaos-mesh/chaos-mesh/api/v1alpha1 v0.0.0-20220226050744-799408773657 // indirect
github.com/confio/ics23/go v0.6.6 // indirect
github.com/cosmos/btcutil v1.0.4 // indirect
Expand Down Expand Up @@ -276,7 +276,8 @@ require (
github.com/slack-go/slack v0.11.3 // indirect
github.com/smartcontractkit/chainlink-relay v0.1.6-0.20221025223751-9b407cff57eb // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20220930034704-572ac07611cb // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20221021145954-aef9beb5fcbf // indirect
github.com/smartcontractkit/ocr2keepers v0.4.8 // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20221103213748-db2f67990850 // indirect
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb // indirect
github.com/smartcontractkit/terra.go v1.0.3-0.20220108002221-62b39252ee16 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
Expand Down Expand Up @@ -304,6 +305,9 @@ require (
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/umbracle/ethgo v0.1.3 // indirect
github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
github.com/valyala/fastjson v1.4.1 // indirect
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand All @@ -312,7 +316,7 @@ require (
github.com/yusufpapurcu/wmi v1.2.2 // indirect
github.com/zondax/hid v0.9.0 // indirect
go.dedis.ch/fixbuf v1.0.3 // indirect
go.dedis.ch/kyber/v3 v3.0.13 // indirect
go.dedis.ch/kyber/v3 v3.0.14 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.opencensus.io v0.23.0 // indirect
go.starlark.net v0.0.0-20220817180228-f738f5508c12 // indirect
Expand All @@ -324,11 +328,11 @@ require (
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/tools v0.2.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
Expand All @@ -342,15 +346,15 @@ require (
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.25.0 // indirect
k8s.io/apiextensions-apiserver v0.25.0 // indirect
k8s.io/apimachinery v0.25.0 // indirect
k8s.io/cli-runtime v0.24.4 // indirect
k8s.io/client-go v0.25.0 // indirect
k8s.io/component-base v0.25.0 // indirect
k8s.io/api v0.25.3 // indirect
k8s.io/apiextensions-apiserver v0.25.3 // indirect
k8s.io/apimachinery v0.25.3 // indirect
k8s.io/cli-runtime v0.25.3 // indirect
k8s.io/client-go v0.25.3 // indirect
k8s.io/component-base v0.25.3 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
k8s.io/kubectl v0.24.4 // indirect
k8s.io/kubectl v0.25.3 // indirect
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
sigs.k8s.io/controller-runtime v0.13.0 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
Expand Down

0 comments on commit 9eb6060

Please sign in to comment.