Merge pull request #715 from oasisprotocol/mitjat/force-sourcify-cache

e2e: Reindex pogreb caches
oasisprotocol · Jun 24, 2024 · 81911f2 · 81911f2
2 parents 6652908 + d297f45
commit 81911f2
Show file tree

Hide file tree

Showing 34 changed files with 40 additions and 33 deletions.
diff --git a/.changelog/715.trivial.1.md b/.changelog/715.trivial.1.md
diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml
@@ -160,6 +160,12 @@ jobs:
       - name: Start db
         run: |
           make postgres
+      - name: Block access to Sourcify
+        # Sourcify should not need to be available in CI; we run everything from caches.
+        # Enforce unavailability to keep tests confidently reproducible, and to catch
+        # any bugs that might cause CI to accidentally use Sourcify.
+        run: |
+          sudo bash -c 'echo 0.0.0.0 sourcify.dev | tee -a /etc/hosts'
       - name: Run e2e regression tests
         run : |
           make E2E_REGRESSION_SUITES=${{ matrix.suite }} test-e2e-regression

diff --git a/cmd/analyzer/analyzer.go b/cmd/analyzer/analyzer.go
@@ -682,7 +682,8 @@ func (a *Service) Start() {
 		}(an)
 	}
 
-	// Prepare slow-sync analyzers (to be started after fast-sync analyzers are done).
+	// Prepare non-fast-sync analyzers (= item analyzers, slow-sync block analyzers);
+	// they will be started after fast-sync analyzers are done.
 	var slowSyncWg sync.WaitGroup
 	for _, an := range a.analyzers {
 		slowSyncWg.Add(1)

diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt b/tests/e2e_regression/damask/rpc-cache/consensus/db.pmt
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/main.pix b/tests/e2e_regression/damask/rpc-cache/consensus/main.pix
diff --git a/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/damask/rpc-cache/consensus/overflow.pix
diff --git a/tests/e2e_regression/damask/rpc-cache/emerald/db.pmt b/tests/e2e_regression/damask/rpc-cache/emerald/db.pmt
diff --git a/tests/e2e_regression/damask/rpc-cache/https_sourcify_dev_server/main.pix b/tests/e2e_regression/damask/rpc-cache/https_sourcify_dev_server/main.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt b/tests/e2e_regression/eden/rpc-cache/consensus/db.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/main.pix b/tests/e2e_regression/eden/rpc-cache/consensus/main.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/eden/rpc-cache/consensus/overflow.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg b/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg
diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg.pmt b/tests/e2e_regression/eden/rpc-cache/emerald/00000-1.psg.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/db.pmt b/tests/e2e_regression/eden/rpc-cache/emerald/db.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/index.pmt b/tests/e2e_regression/eden/rpc-cache/emerald/index.pmt
diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/main.pix b/tests/e2e_regression/eden/rpc-cache/emerald/main.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/emerald/overflow.pix b/tests/e2e_regression/eden/rpc-cache/emerald/overflow.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/https_sourcify_dev_server/main.pix b/tests/e2e_regression/eden/rpc-cache/https_sourcify_dev_server/main.pix
diff --git a/tests/e2e_regression/eden/rpc-cache/https_sourcify_dev_server/overflow.pix b/tests/e2e_regression/eden/rpc-cache/https_sourcify_dev_server/overflow.pix
diff --git a/tests/e2e_regression/edenfast/e2e_config_1.yml b/tests/e2e_regression/edenfast/e2e_config_1.yml
@@ -41,15 +41,15 @@ analysis:
     # Also, sapphire does not use much code that is not covered by emerald.
   storage:
     backend: postgres
-    endpoint: postgresql://rwuser:password@172.17.0.2:5432/indexer?sslmode=disable
+    endpoint: postgresql://rwuser:password@localhost:5432/indexer?sslmode=disable
     DANGER__WIPE_STORAGE_ON_STARTUP: true
     migrations: file://storage/migrations
 
 server:
   chain_name: mainnet
   endpoint: localhost:8008
   storage:
-    endpoint: postgresql://rwuser:password@172.17.0.2:5432/indexer?sslmode=disable
+    endpoint: postgresql://rwuser:password@localhost:5432/indexer?sslmode=disable
     backend: postgres
 
 log:

diff --git a/tests/e2e_regression/edenfast/e2e_config_2.yml b/tests/e2e_regression/edenfast/e2e_config_2.yml
@@ -26,7 +26,7 @@ analysis:
     # aggregate_stats: {}   # Awkward to make stop after a single run.
   storage:
     backend: postgres
-    endpoint: postgresql://rwuser:password@172.17.0.2:5432/indexer?sslmode=disable
+    endpoint: postgresql://rwuser:password@localhost:5432/indexer?sslmode=disable
     # DANGER__WIPE_STORAGE_ON_STARTUP: true
     migrations: file://storage/migrations
 

diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/db.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt b/tests/e2e_regression/edenfast/rpc-cache/consensus/index.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix b/tests/e2e_regression/edenfast/rpc-cache/consensus/main.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/consensus/overflow.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/00000-1.psg b/tests/e2e_regression/edenfast/rpc-cache/emerald/00000-1.psg
diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/00000-1.psg.pmt b/tests/e2e_regression/edenfast/rpc-cache/emerald/00000-1.psg.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/db.pmt b/tests/e2e_regression/edenfast/rpc-cache/emerald/db.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/index.pmt b/tests/e2e_regression/edenfast/rpc-cache/emerald/index.pmt
diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/main.pix b/tests/e2e_regression/edenfast/rpc-cache/emerald/main.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/emerald/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/emerald/overflow.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/main.pix b/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/main.pix
diff --git a/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/overflow.pix b/tests/e2e_regression/edenfast/rpc-cache/https_sourcify_dev_server/overflow.pix
diff --git a/tests/e2e_regression/run.sh b/tests/e2e_regression/run.sh
@@ -148,4 +148,4 @@ diff --recursive "$TEST_DIR/expected" "$outDir" >/dev/null || {
 }
 
 echo
-echo "E2E regression tests passed!"
+echo "E2E regression test suite \"$suite\" passed!"
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     echo
-    echo "E2E regression tests passed!"
+    echo "E2E regression test suite \"$suite\" passed!"