horizon: Fix integration tests (#4314)

stellar · Apr 4, 2022 · 4bdb8f3 · 4bdb8f3
1 parent abd5fb7
commit 4bdb8f3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -15,7 +15,7 @@ jobs:
         go: [1.17, 1.18]
         pg: [9.6.5]
         ingestion-backend: [db, captive-core, captive-core-remote-storage]
-        captive-core: [18.0.3-746.f3baea6.focal]
+        captive-core: [18.5.0-873.rc1.d387c6a71.focal]
     runs-on: ${{ matrix.os }}
     services:
       postgres:
@@ -47,6 +47,16 @@ jobs:
         # Otherwise, the Go test cache will fail (due to the modification time of fixtures changing).
         fetch-depth: '0'
 
+    # In order to debug the integration tests, run 'touch continue' once you connect to the ssh session
+    #
+    # - name: Setup upterm session
+    #  uses: lhotari/action-upterm@d23c2722bdab893785c9fbeae314cbf080645bd7
+    #  with:
+    #    ## limits ssh access and adds the ssh public key for the user which triggered the workflow
+    #    limit-access-to-actor: true
+    #    ## limits ssh access and adds the ssh public keys of the listed GitHub users
+    #    limit-access-to-users: <yourGithubUser>
+
     - uses: ./.github/actions/setup-go
       with:
         go-version: ${{ matrix.go }}

diff --git a/services/horizon/docker/docker-compose.integration-tests.yml b/services/horizon/docker/docker-compose.integration-tests.yml
@@ -11,12 +11,10 @@ services:
     command: ["-p", "5641"]
   core:
     platform: linux/amd64
-    # TODO replace with official SDF image when ready. Note that this:
-    # https://github.com/stellar/stellar-core/commit/31597b760f8e325fc84da0937adc373a78878ca9
-    # breaks the tests. I reverted it before building temp docker image.
-    # Command used to build custom image:
-    # docker build -t bartekno/stellar-core:17.4.0-p18 --build-arg STELLAR_CORE_VERSION=17.3.1-679.c5f6349.focal~protocol18~buildtests --build-arg DISTRO=focal .
-    image: ${CORE_IMAGE:-stellar/stellar-core:18}
+    # Note: Please keep the image pinned to an immutable tag matching the Captive Core version.
+    #       This avoid implicit updates which break compatibility between
+    #       the Core container and captive core.
+    image: ${CORE_IMAGE:-stellar/stellar-core:18.5.0-873.rc1.d387c6a71.focal}
     depends_on:
       - core-postgres
     restart: on-failure