From 5466334122cccd77cf944f4eac10ecb4edb7dd06 Mon Sep 17 00:00:00 2001 From: aalu1418 <50029043+aalu1418@users.noreply.github.com> Date: Wed, 22 May 2024 08:09:03 -0600 Subject: [PATCH 1/2] bump ctf to v1.28.15 --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3bf21f6cb..13d79e8bb 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -16,7 +16,7 @@ require ( github.com/rs/zerolog v1.30.0 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240516150131-e1be553a9d10 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240510181707-46b1311a5a83 - github.com/smartcontractkit/chainlink-testing-framework v1.28.15-0.20240520085642-b994043307a4 + github.com/smartcontractkit/chainlink-testing-framework v1.28.15 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240515225456-aeb9f4d50d65 github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240515225456-aeb9f4d50d65 github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 79c3005cc..e959f07bf 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1416,8 +1416,8 @@ github.com/smartcontractkit/chainlink-feeds v0.0.0-20240422130241-13c17a91b2ab h github.com/smartcontractkit/chainlink-feeds v0.0.0-20240422130241-13c17a91b2ab/go.mod h1:RPUY7r8GxgzXxS1ijtU1P/fpJomOXztXgUbEziNmbCA= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240508155030-1024f2b55c69 h1:ssh/w3oXWu+C6bE88GuFRC1+0Bx/4ihsbc80XMLrl2k= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240508155030-1024f2b55c69/go.mod h1:VsfjhvWgjxqWja4q+FlXEtX5lu8BSxn10xRo6gi948g= -github.com/smartcontractkit/chainlink-testing-framework v1.28.15-0.20240520085642-b994043307a4 h1:XorHCAKux5+/jYsnGLRYOMBSW7Q3pKZJaxqRCZOW/UU= -github.com/smartcontractkit/chainlink-testing-framework v1.28.15-0.20240520085642-b994043307a4/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A= +github.com/smartcontractkit/chainlink-testing-framework v1.28.15 h1:mga7N6jtXQ3UOCt43IdsEnCMBh9xjOWPaE9BiM6kr6Q= +github.com/smartcontractkit/chainlink-testing-framework v1.28.15/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A= github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240328204215-ac91f55f1449 h1:fX/xmGm1GBsD1ZZnooNT+eWA0hiTAqFlHzOC5CY4dy8= github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240328204215-ac91f55f1449/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU= github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772 h1:LQmRsrzzaYYN3wEU1l5tWiccznhvbyGnu2N+wHSXZAo= From 6c99008f50e91b65a82b4bc03c3f600e0604ff86 Mon Sep 17 00:00:00 2001 From: aalu1418 <50029043+aalu1418@users.noreply.github.com> Date: Wed, 22 May 2024 08:58:53 -0600 Subject: [PATCH 2/2] remove soak test reference --- .github/actions/build-test-image/action.yml | 2 +- Makefile | 4 ---- integration-tests/scripts/buildTestImage | 2 +- integration-tests/test.Dockerfile | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml index ae57a5616..6a2e50d60 100644 --- a/.github/actions/build-test-image/action.yml +++ b/.github/actions/build-test-image/action.yml @@ -57,7 +57,7 @@ runs: build-args: | BASE_IMAGE=${{ inputs.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ inputs.QA_AWS_REGION }}.amazonaws.com/test-base-image IMAGE_VERSION=${{ steps.version.outputs.version }} - SUITES="soak smoke" + SUITES="smoke" AWS_REGION: ${{ inputs.QA_AWS_REGION }} AWS_ROLE_TO_ASSUME: ${{ inputs.QA_AWS_ROLE_TO_ASSUME }} - name: Print Image Built diff --git a/Makefile b/Makefile index 4030022bd..288ea388e 100644 --- a/Makefile +++ b/Makefile @@ -84,10 +84,6 @@ test_smoke: cd ./integration-tests &&\ SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt -test_ocr_soak: - cd ./integration-tests &&\ - SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) ./soak 2>&1 | tee /tmp/gotest.log | gotestfmt - gomodtidy: go mod tidy cd ./integration-tests && go mod tidy diff --git a/integration-tests/scripts/buildTestImage b/integration-tests/scripts/buildTestImage index b76598951..22c70e098 100755 --- a/integration-tests/scripts/buildTestImage +++ b/integration-tests/scripts/buildTestImage @@ -13,7 +13,7 @@ cd "$SCRIPT_DIR"/../../ || exit 1 TAG_VERSION="${1}" BASE_IMAGE_VERSION="${2}" SUITES=$3 -DEFAULT_SUITES="smoke soak" +DEFAULT_SUITES="smoke" ACCOUNT=$(aws sts get-caller-identity | jq -r .Account) AWS_BASE="${ACCOUNT}".dkr.ecr.us-west-2.amazonaws.com TAG="${AWS_BASE}"/chainlink-solana-tests:"${TAG_VERSION}" diff --git a/integration-tests/test.Dockerfile b/integration-tests/test.Dockerfile index 5964b75df..8b7feeafc 100644 --- a/integration-tests/test.Dockerfile +++ b/integration-tests/test.Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE ARG IMAGE_VERSION=latest FROM ${BASE_IMAGE}:${IMAGE_VERSION} -ARG SUITES=smoke soak +ARG SUITES=smoke COPY . testdir/ WORKDIR /go/testdir