ci: consistently use httpbin instead of httpbin-local

.gitlab/services.yml

@@ -50,9 +50,9 @@
       KAFKA_PROCESS_ROLES: controller,broker
       KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9093
       KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
-  httpbin_local:
+  httpbin:
     name: registry.ddbuild.io/images/mirror/mccutchen/go-httpbin:v2.14.1
-    alias: httpbin-local
+    alias: httpbin
     variables:
       PORT: 8001
   memcached:

docker-compose.yml

@@ -213,7 +213,7 @@ services:
           - "${TMPDIR:-/var/lib/localstack}:/var/lib/localstack"
           - "/var/run/docker.sock:/var/run/docker.sock"
 
-    httpbin-local:
+    httpbin:
       image: kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb
       platform: linux/amd64
       ports:

tests/contrib/httpx/test_httpx.py

@@ -12,7 +12,7 @@
 from tests.utils import override_http_config
 
 
-# host:port of httpbin_local container
+# host:port of httpbin container
 HOST = "localhost"
 PORT = 8001
 

tests/contrib/httpx/test_httpx_pre_0_11.py

@@ -12,7 +12,7 @@
 from tests.utils import override_http_config
 
 
-# host:port of httpbin_local container
+# host:port of httpbin container
 HOST = "localhost"
 PORT = 8001
 

tests/contrib/suitespec.yml

@@ -228,7 +228,7 @@ suites:
       - tests/snapshots/tests.{suite}.*
     runner: riot
     services:
-      - httpbin_local
+      - httpbin
     snapshot: true
   aiomysql:
     parallelism: 2
@@ -772,7 +772,7 @@ suites:
       - tests/contrib/httplib/*
     runner: riot
     services:
-      - httpbin_local
+      - httpbin
     snapshot: true
   httpx:
     parallelism: 3
@@ -786,7 +786,7 @@ suites:
       - tests/snapshots/tests.contrib.httpx.*
     runner: riot
     services:
-      - httpbin_local
+      - httpbin
     snapshot: true
   integration_registry:
     paths:
@@ -1117,7 +1117,7 @@ suites:
       - tests/contrib/requests/*
     runner: riot
     services:
-      - httpbin_local
+      - httpbin
     snapshot: true
   rq:
     parallelism: 1
@@ -1261,7 +1261,7 @@ suites:
   urllib3:
     parallelism: 1
     env:
-      TEST_HTTPBIN_HOST: httpbin-local
+      TEST_HTTPBIN_HOST: httpbin
       TEST_HTTPBIN_PORT: '8001'
     paths:
       - '@bootstrap'
@@ -1273,7 +1273,7 @@ suites:
       - tests/snapshots/tests.contrib.urllib3.*
     runner: riot
     services:
-      - httpbin_local
+      - httpbin
     snapshot: true
   vertica:
     parallelism: 1

tests/contrib/urllib3/test_urllib3.py

@@ -19,7 +19,7 @@
 from tests.utils import snapshot
 
 
-# host:port of httpbin_local container
+# host:port of httpbin container
 HOST = HTTPBIN_CONFIG["host"]
 PORT = HTTPBIN_CONFIG["port"]
 SOCKET = "{}:{}".format(HOST, PORT)

tests/wait-for-services.py

@@ -195,7 +195,7 @@ def check_azurite(azurite_config):
         "cassandra": check_cassandra,
         "ddagent": check_agent,
         "elasticsearch": check_elasticsearch,
-        "httpbin_local": check_httpbin,
+        "httpbin": check_httpbin,
         "moto": check_moto,
         "mysql": check_mysql,
         "opensearch": check_opensearch,