From df6f4b0e3a83bef78bc5e592fc6e1e4b992a3d93 Mon Sep 17 00:00:00 2001 From: George Date: Thu, 31 Oct 2024 09:21:19 -0700 Subject: [PATCH 1/4] Upgrade docker image in integration tests --- .github/workflows/soroban-rpc.yml | 4 ++-- cmd/soroban-rpc/internal/integrationtest/migrate_test.go | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml index 43c588a1..e97dc82f 100644 --- a/.github/workflows/soroban-rpc.yml +++ b/.github/workflows/soroban-rpc.yml @@ -106,8 +106,8 @@ jobs: SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal - PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal - PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal + PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2126.rc3.92923c2db.focal + PROTOCOL_22_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:22.0.0-2126.rc3.92923c2db.focal steps: - uses: actions/checkout@v4 diff --git a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go index 7358bc06..750b8b82 100644 --- a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go +++ b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go @@ -31,11 +31,6 @@ func TestMigrate(t *testing.T) { // This version of RPC wasn't published as a docker container continue } - if originVersion == "22.0.0-rc2" { - // This version of RPC can't be upgraded to since that's the one - // set in the soroban_rpc.yml file - continue - } t.Run(originVersion, func(t *testing.T) { testMigrateFromVersion(t, originVersion) }) From 147aa8cb4de385e264a8f86bb834ef5830afbfbc Mon Sep 17 00:00:00 2001 From: George Date: Thu, 31 Oct 2024 09:46:06 -0700 Subject: [PATCH 2/4] Skip rc2 again --- cmd/soroban-rpc/internal/integrationtest/migrate_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go index 750b8b82..3a78fc19 100644 --- a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go +++ b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go @@ -31,6 +31,10 @@ func TestMigrate(t *testing.T) { // This version of RPC wasn't published as a docker container continue } + if originVersion == "22.0.0-rc2" { + // This version of RPC wasn't published as a docker container w/ this tag + continue + } t.Run(originVersion, func(t *testing.T) { testMigrateFromVersion(t, originVersion) }) From f536df3dbe262db05e796dbc7c4fd7ea9762660d Mon Sep 17 00:00:00 2001 From: George Date: Thu, 31 Oct 2024 09:46:53 -0700 Subject: [PATCH 3/4] Use stable repo image --- .github/workflows/soroban-rpc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml index e97dc82f..74e12d56 100644 --- a/.github/workflows/soroban-rpc.yml +++ b/.github/workflows/soroban-rpc.yml @@ -107,7 +107,7 @@ jobs: PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2126.rc3.92923c2db.focal - PROTOCOL_22_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:22.0.0-2126.rc3.92923c2db.focal + PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2126.rc3.92923c2db.focal steps: - uses: actions/checkout@v4 From 8471886d75c7903376f0a943c7220fa5c54ac81a Mon Sep 17 00:00:00 2001 From: George Date: Mon, 4 Nov 2024 10:52:47 -0800 Subject: [PATCH 4/4] Ignore rc3 too I guess --- cmd/soroban-rpc/internal/integrationtest/migrate_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go index 3a78fc19..2e646b2d 100644 --- a/cmd/soroban-rpc/internal/integrationtest/migrate_test.go +++ b/cmd/soroban-rpc/internal/integrationtest/migrate_test.go @@ -31,7 +31,7 @@ func TestMigrate(t *testing.T) { // This version of RPC wasn't published as a docker container continue } - if originVersion == "22.0.0-rc2" { + if originVersion == "22.0.0-rc2" || originVersion == "22.0.0-rc3" { // This version of RPC wasn't published as a docker container w/ this tag continue }