From 5815af80ae2fbfc041fbc37e78ec5ba74b9ed766 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Mon, 18 Mar 2024 13:57:12 +0100
Subject: [PATCH] Revert "Lower sleep even more"

This reverts commit 576c1efca63f0baae582d899696578607e4cc230.
---
 .github/workflows/assert-empty-json   |  2 +-
 .github/workflows/assert-reverse-only |  2 +-
 .github/workflows/ci.yml              | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/assert-empty-json b/.github/workflows/assert-empty-json
index a43cbeb2..a0b810f6 100755
--- a/.github/workflows/assert-empty-json
+++ b/.github/workflows/assert-empty-json
@@ -16,7 +16,7 @@ from requests.packages.urllib3.util.retry import Retry
 logging.basicConfig(level=logging.WARNING)
 
 s = requests.Session()
-retries = Retry(total=18, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
+retries = Retry(total=7, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
 s.mount('http://', HTTPAdapter(max_retries=retries))
 
 resp = s.get(sys.argv[1])
diff --git a/.github/workflows/assert-reverse-only b/.github/workflows/assert-reverse-only
index 48876aae..1d14168d 100755
--- a/.github/workflows/assert-reverse-only
+++ b/.github/workflows/assert-reverse-only
@@ -16,7 +16,7 @@ from requests.packages.urllib3.util.retry import Retry
 logging.basicConfig(level=logging.WARNING)
 
 s = requests.Session()
-retries = Retry(total=18, backoff_factor=2, status_forcelist=[502, 503, 504])
+retries = Retry(total=7, backoff_factor=2, status_forcelist=[502, 503, 504])
 s.mount('http://', HTTPAdapter(max_retries=retries))
 
 resp = s.get(sys.argv[1])
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd7af116..7136f964 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
             -p 8001:8080 \
             --name nominatim \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8001/search.php?q=avenue%20pasteur"
           ${{ matrix.nominatim.update_command }}
           ./assert-non-empty-json "http://localhost:8001/search.php?q=avenue%20pasteur"
@@ -64,7 +64,7 @@ jobs:
             -v nominatim-data:/var/lib/postgresql/${{ matrix.nominatim.postgres_version }}/main \
             -p 8002:8080 \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8002/search.php?q=avenue%20pasteur"
 
       - name: Check import with bind-mount
@@ -80,7 +80,7 @@ jobs:
             -p 8003:8080 \
             --name nominatim \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8003/search.php?q=avenue%20pasteur"
           docker stop nominatim
 
@@ -104,6 +104,7 @@ jobs:
           docker stop nominatim
 
       - name: Check UPDATE_MODE=once with volume
+        if: matrix.nominatim.version != '4.0'
         working-directory: .github/workflows
         run: |-
           # get the data from four days ago to make sure there really are updates to apply
@@ -117,13 +118,14 @@ jobs:
             -p 8004:8080 \
             --name nominatim \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8004/search.php?q=avenue%20pasteur"
           echo "check replication log for Update completed. Count:"
           docker exec -i nominatim grep -c 'Update completed.' /var/log/replication.log
           docker stop nominatim
 
       - name: Check UPDATE_MODE=continuous with bind-mount
+        if: matrix.nominatim.version != '4.0'
         working-directory: .github/workflows
         run: |-
           # get the data from few days ago to make sure there really are updates to apply
@@ -137,7 +139,7 @@ jobs:
             -p 8004:8080 \
             --name nominatim \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8004/search.php?q=avenue%20pasteur"
           echo "check replication log for Update completed. Count:"
           docker exec -i nominatim grep -c 'Update completed.' /var/log/replication.log
@@ -153,7 +155,7 @@ jobs:
             -e USER_AGENT=${{matrix.nominatim.user_agent}} \
             -p 8005:8080 \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8005/search.php?q=hotel%20de%20paris"
 
       - name: Check import admin style
@@ -166,7 +168,7 @@ jobs:
             -e USER_AGENT=${{matrix.nominatim.user_agent}} \
             -p 8006:8080 \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-empty-json "http://localhost:8006/search.php?q=hotel%20de%20paris"
 
       - name: Check import with PBF_PATH
@@ -182,7 +184,7 @@ jobs:
             -p 8007:8080 \
             --name nominatim \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8007/search.php?q=avenue%20pasteur"
           docker stop nominatim
           docker volume rm nominatim7-data
@@ -195,7 +197,7 @@ jobs:
             -e USER_AGENT=${{matrix.nominatim.user_agent}} \
             -p 8008:8080 \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8008/search.php?q=avenue%20pasteur"
 
       - name: Check when using FREEZE
@@ -207,7 +209,7 @@ jobs:
             -e FREEZE="true" \
             -p 8009:8080 \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-non-empty-json "http://localhost:8009/search.php?q=avenue%20pasteur"
 
       - name: Check GB postcode import
@@ -233,7 +235,7 @@ jobs:
             -e REVERSE_ONLY="true" \
             -p 8011:8080 \
             nominatim &
-          sleep 60
+          sleep 120
           ./assert-reverse-only "http://localhost:8011/search.php?q=avenue%20pasteur"
           ./assert-non-empty-json "http://localhost:8011/reverse.php?lat=43.734&lon=7.42&format=jsonv2"