fix tests on debian buster; misc release improvements

Author: dgoffredo

bin/docker_build.sh

@@ -51,6 +51,7 @@ while [ $# -ne 0 ]; do
 done
 
 if [ -z "$base_image" ]; then
+    # shellcheck disable=SC1091
     . "$repo/nginx-version-info"
     # shellcheck disable=SC2153
     base_image="$BASE_IMAGE"

bin/release.py

@@ -228,7 +228,7 @@ def send_ci_request_paged(path, payload=None, method=None):
 
 # TODO: Poll until the number of "build-and-test-all" jobs changes from
 # zero.
-delay_seconds = 10
+delay_seconds = 20
 print(f'sleeping for {delay_seconds} seconds...')
 time.sleep(delay_seconds)
 
@@ -328,7 +328,7 @@ def handle_job(job, work_dir):
 while True:
     jobs = send_ci_request_paged(f'/workflow/{workflow_id}/job')
     for job in jobs:
-        if job['status'] == 'blocked':
+        if job['status'] in ('blocked', 'not_running'):
             continue
         job_number = job['job_number']
         if job_number not in done_jobs:

bin/run_in_build_image.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 repo=$(dirname "$0")/..
+# shellcheck disable=SC1091
 . "$repo/nginx-version-info"
 base_image_without_colons=$(echo "$BASE_IMAGE" | tr ':' '_')
 built_image="nginx-datadog-build-$base_image_without_colons"
@@ -11,6 +12,11 @@ if tty --silent; then
   interactive_flags='--interactive --tty'
 fi
 
+# If the image doesn't exist locally, try DockerHub instead.
+if [ "$(docker images -q "$BUILD_IMAGE:latest" 2>/dev/null)" = '' ]; then
+  BUILD_IMAGE=datadog/docker-library:$BUILD_IMAGE
+fi
+
 # shellcheck disable=SC2086
 docker run \
     $interactive_flags \

test/services/nginx/install_tools.sh

@@ -11,6 +11,12 @@ install_nginx_on_amazon_linux() {
 # nginx.
 # Also, if we're on Amazon Linux, nginx won't be installed yet, so install it.
 if command -v apt-get >/dev/null 2>&1; then
+    # If this is Debian "stretch," then we need to change the package
+    # repository links as of April 2023.
+    . /etc/os-release
+    if [ "$PRETTY_NAME" = 'Debian GNU/Linux 9 (stretch)' ]; then
+        echo 'deb http://archive.debian.org/debian stretch main contrib non-free' >/etc/apt/sources.list
+    fi
     apt-get update
     DEBIAN_FRONTEND=noninteractive apt-get install -y procps
     if ! command -v nginx >/dev/null 2>&1; then