From 2f346fbdd5c44e64443db44ee810a71929c9203c Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Wed, 9 Mar 2022 12:30:05 -0500 Subject: [PATCH 1/2] chore: E2E Test Suite GHCR #630 (cherry picked from commit 8a794c8315c11afdfd9fcbcc36becfdd05e926ce) # Conflicts: # .github/workflows/tests.yml --- .github/workflows/tests.yml | 3 +++ Makefile | 4 ++-- tests/e2e/e2e_setup_test.go | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d036ceb13b..db17f5afa5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,6 +77,7 @@ jobs: make test-e2e if: env.GIT_DIFF +<<<<<<< HEAD # split-test-files: # runs-on: ubuntu-latest # steps: @@ -180,6 +181,8 @@ jobs: # name: "${{ github.sha }}-${{ matrix.part }}-coverage" # path: ./${{ matrix.part }}profile.out +======= +>>>>>>> 8a794c8 (chore: E2E Test Suite GHCR #630) price-feeder: runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index 9a291d214e..f4e12a6125 100644 --- a/Makefile +++ b/Makefile @@ -116,10 +116,10 @@ docker-build-debug: @docker build -t umeenet/umeed --build-arg IMG_TAG=debug . docker-push-hermes: - @cd tests/e2e/docker; docker build -t umeenet/hermes:latest -f hermes.Dockerfile .; docker push umeenet/hermes:latest + @cd tests/e2e/docker; docker build -t ghcr.io/umee-network/hermes-e2e:latest -f hermes.Dockerfile .; docker push ghcr.io/umee-network/hermes-e2e:latest docker-push-gaia: - @cd tests/e2e/docker; docker build -t umeenet/gaia:latest -f gaia.Dockerfile .; docker push umeenet/gaia:latest + @cd tests/e2e/docker; docker build -t ghcr.io/umee-network/gaia-e2e:latest -f gaia.Dockerfile .; docker push ghcr.io/umee-network/gaia-e2e:latest .PHONY: docker-build docker-build-debug docker-push-hermes docker-push-gaia diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 5913f4313f..1833daa784 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -493,7 +493,7 @@ func (s *IntegrationTestSuite) runGaiaNetwork() { s.gaiaResource, err = s.dkrPool.RunWithOptions( &dockertest.RunOptions{ Name: gaiaVal.instanceName(), - Repository: "umeenet/gaia", + Repository: "ghcr.io/umee-network/gaia-e2e", Tag: "latest", NetworkID: s.dkrNet.Network.ID, Mounts: []string{ @@ -569,7 +569,7 @@ func (s *IntegrationTestSuite) runIBCRelayer() { s.hermesResource, err = s.dkrPool.RunWithOptions( &dockertest.RunOptions{ Name: "umee-gaia-relayer", - Repository: "umeenet/hermes", + Repository: "ghcr.io/umee-network/hermes-e2e", Tag: "latest", NetworkID: s.dkrNet.Network.ID, Mounts: []string{ From fe5a86a5624318ffcafd249498a2cf74397e9189 Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Wed, 9 Mar 2022 12:43:36 -0500 Subject: [PATCH 2/2] updates --- .github/workflows/tests.yml | 106 ------------------------------------ 1 file changed, 106 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index db17f5afa5..b8fdd8f0c1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,112 +77,6 @@ jobs: make test-e2e if: env.GIT_DIFF -<<<<<<< HEAD - # split-test-files: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - name: Create Packages File - # run: go list ./... > pkgs.txt - # - name: Split Packages into Files - # run: split -d -n l/4 pkgs.txt pkgs.txt.part. - # - uses: actions/upload-artifact@v2 - # with: - # name: "${{ github.sha }}-00" - # path: ./pkgs.txt.part.00 - # - uses: actions/upload-artifact@v2 - # with: - # name: "${{ github.sha }}-01" - # path: ./pkgs.txt.part.01 - # - uses: actions/upload-artifact@v2 - # with: - # name: "${{ github.sha }}-02" - # path: ./pkgs.txt.part.02 - # - uses: actions/upload-artifact@v2 - # with: - # name: "${{ github.sha }}-03" - # path: ./pkgs.txt.part.03 - - # upload-coverage-report: - # runs-on: ubuntu-latest - # needs: tests - # steps: - # - uses: actions/checkout@v2 - # - uses: technote-space/get-diff-action@v6.0.1 - # with: - # PATTERNS: | - # **/**.go - # go.mod - # go.sum - # - uses: actions/download-artifact@v2 - # with: - # name: "${{ github.sha }}-00-coverage" - # if: env.GIT_DIFF - # - uses: actions/download-artifact@v2 - # with: - # name: "${{ github.sha }}-01-coverage" - # if: env.GIT_DIFF - # - uses: actions/download-artifact@v2 - # with: - # name: "${{ github.sha }}-02-coverage" - # if: env.GIT_DIFF - # - uses: actions/download-artifact@v2 - # with: - # name: "${{ github.sha }}-03-coverage" - # if: env.GIT_DIFF - # - run: | - # cat ./*profile.out | grep -v "mode: atomic" >> coverage.txt - # if: env.GIT_DIFF - # - name: filter out DONTCOVER - # run: | - # excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER')" - # excludelist+=" $(find ./ -type f -name '*.pb.go')" - # excludelist+=" $(find ./ -type f -name '*.pb.gw.go')" - # excludelist+=" $(find ./ -type f -path './tests/mocks/*.go')" - # for filename in ${excludelist}; do - # filename=$(echo $filename | sed 's/^./github.com\/cosmos\/cosmos-sdk/g') - # echo "Excluding ${filename} from coverage report..." - # sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt - # done - # if: env.GIT_DIFF - # - uses: codecov/codecov-action@v2.1.0 - # with: - # file: ./coverage.txt - # if: env.GIT_DIFF - - # tests: - # runs-on: ubuntu-latest - # needs: split-test-files - # strategy: - # fail-fast: false - # matrix: - # part: ["00", "01", "02", "03"] - # steps: - # - uses: actions/checkout@v2 - # - uses: actions/setup-go@v2.1.5 - # with: - # go-version: 1.17 - # - uses: technote-space/get-diff-action@v6.0.1 - # with: - # PATTERNS: | - # **/**.go - # go.mod - # go.sum - # - uses: actions/download-artifact@v2 - # with: - # name: "${{ github.sha }}-${{ matrix.part }}" - # if: env.GIT_DIFF - # - name: Create Test and Coverage Report - # run: | - # cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic - # if: env.GIT_DIFF - # - uses: actions/upload-artifact@v2 - # with: - # name: "${{ github.sha }}-${{ matrix.part }}-coverage" - # path: ./${{ matrix.part }}profile.out - -======= ->>>>>>> 8a794c8 (chore: E2E Test Suite GHCR #630) price-feeder: runs-on: ubuntu-latest steps: