Skip to content

Commit

Permalink
Lower sleep even more
Browse files Browse the repository at this point in the history
  • Loading branch information
leonardehrenfried committed Mar 18, 2024
1 parent 247ab3b commit 576c1ef
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assert-empty-json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ from requests.packages.urllib3.util.retry import Retry
logging.basicConfig(level=logging.WARNING)

s = requests.Session()
retries = Retry(total=7, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
retries = Retry(total=18, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
s.mount('http://', HTTPAdapter(max_retries=retries))

resp = s.get(sys.argv[1])
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assert-reverse-only
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ from requests.packages.urllib3.util.retry import Retry
logging.basicConfig(level=logging.WARNING)

s = requests.Session()
retries = Retry(total=7, backoff_factor=2, status_forcelist=[502, 503, 504])
retries = Retry(total=18, backoff_factor=2, status_forcelist=[502, 503, 504])
s.mount('http://', HTTPAdapter(max_retries=retries))

resp = s.get(sys.argv[1])
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
-p 8001:8080 \
--name nominatim \
nominatim &
sleep 120
sleep 60
./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"
Expand All @@ -64,7 +64,7 @@ jobs:
-v nominatim-data:/var/lib/postgresql/${{ matrix.nominatim.postgres_version }}/main \
-p 8002:8080 \
nominatim &
sleep 120
sleep 60
./assert-non-empty-json "http://localhost:8002/search.php?q=avenue%20pasteur"
- name: Check import with bind-mount
Expand All @@ -80,7 +80,7 @@ jobs:
-p 8003:8080 \
--name nominatim \
nominatim &
sleep 120
sleep 60
./assert-non-empty-json "http://localhost:8003/search.php?q=avenue%20pasteur"
docker stop nominatim
Expand All @@ -104,7 +104,6 @@ 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
Expand All @@ -118,14 +117,13 @@ jobs:
-p 8004:8080 \
--name nominatim \
nominatim &
sleep 120
sleep 60
./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
Expand All @@ -139,7 +137,7 @@ jobs:
-p 8004:8080 \
--name nominatim \
nominatim &
sleep 120
sleep 60
./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
Expand All @@ -155,7 +153,7 @@ jobs:
-e USER_AGENT=${{matrix.nominatim.user_agent}} \
-p 8005:8080 \
nominatim &
sleep 120
sleep 60
./assert-non-empty-json "http://localhost:8005/search.php?q=hotel%20de%20paris"
- name: Check import admin style
Expand All @@ -168,7 +166,7 @@ jobs:
-e USER_AGENT=${{matrix.nominatim.user_agent}} \
-p 8006:8080 \
nominatim &
sleep 120
sleep 60
./assert-empty-json "http://localhost:8006/search.php?q=hotel%20de%20paris"
- name: Check import with PBF_PATH
Expand All @@ -184,7 +182,7 @@ jobs:
-p 8007:8080 \
--name nominatim \
nominatim &
sleep 120
sleep 60
./assert-non-empty-json "http://localhost:8007/search.php?q=avenue%20pasteur"
docker stop nominatim
docker volume rm nominatim7-data
Expand All @@ -197,7 +195,7 @@ jobs:
-e USER_AGENT=${{matrix.nominatim.user_agent}} \
-p 8008:8080 \
nominatim &
sleep 120
sleep 60
./assert-non-empty-json "http://localhost:8008/search.php?q=avenue%20pasteur"
- name: Check when using FREEZE
Expand All @@ -209,7 +207,7 @@ jobs:
-e FREEZE="true" \
-p 8009:8080 \
nominatim &
sleep 120
sleep 60
./assert-non-empty-json "http://localhost:8009/search.php?q=avenue%20pasteur"
- name: Check GB postcode import
Expand All @@ -235,7 +233,7 @@ jobs:
-e REVERSE_ONLY="true" \
-p 8011:8080 \
nominatim &
sleep 120
sleep 60
./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"
Expand Down

0 comments on commit 576c1ef

Please sign in to comment.