Merge branch 'feature/workflow-build-images' into test/workflow-build-images

* feature/workflow-build-images:
  use the docker images from the github container registry
  fix

Author: v1v

.github/workflows/run-matrix.yml

@@ -20,6 +20,10 @@ jobs:
       max-parallel: 10
       matrix:
         include: ${{ fromJSON(inputs.include) }}
+    env:
+      # These env variables are used in the docker-compose.yml and the run_tests.sh script.
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}/apm-agent-python-testing
     steps:
       - uses: actions/checkout@v4
       - name: Run tests

tests/docker-compose.yml

@@ -185,7 +185,7 @@ services:
       - zookeeper
 
   run_tests:
-    image: elasticobservability/apm-agent-python-testing:${PYTHON_VERSION}
+    image: ${REGISTRY:-elasticobservability}/${IMAGE_NAME:-apm-agent-python-testing}:${PYTHON_VERSION}
     environment:
       ES_8_URL: 'http://elasticsearch8:9200'
       ES_7_URL: 'http://elasticsearch7:9200'

tests/scripts/docker/run_tests.sh

@@ -2,7 +2,7 @@
 set -ex
 
 function cleanup {
-    PYTHON_VERSION=${1} docker compose down -v
+    PYTHON_VERSION=${1} REGISTRY=${REGISTRY} IMAGE_NAME=${IMAGE_NAME} docker compose down -v
 
     if [[ $CODECOV_TOKEN ]]; then
         cd ..
@@ -21,6 +21,8 @@ docker_pip_cache="/tmp/cache/pip"
 TEST="${1}/${2}"
 LOCAL_USER_ID=${LOCAL_USER_ID:=$(id -u)}
 LOCAL_GROUP_ID=${LOCAL_GROUP_ID:=$(id -g)}
+IMAGE_NAME=${IMAGE_NAME:-"apm-agent-python-testing"}
+REGISTRY=${REGISTRY:-"elasticobservability"}
 
 cd tests
 
@@ -42,18 +44,19 @@ echo "Running tests for ${1}/${2}"
 
 if [[ -n $DOCKER_DEPS ]]
 then
-    PYTHON_VERSION=${1} docker compose up -d ${DOCKER_DEPS}
+    PYTHON_VERSION=${1} REGISTRY=${REGISTRY} IMAGE_NAME=${IMAGE_NAME} docker compose up -d ${DOCKER_DEPS}
 fi
 
 # CASS_DRIVER_NO_EXTENSIONS is set so we don't build the Cassandra C-extensions,
 # as this can take several minutes
 
 if ! ${CI}; then
+  full_image_name="${REGISTRY}/${IMAGE_NAME}:${1}"
   DOCKER_BUILDKIT=1 docker build \
     --progress=plain \
-    --cache-from="elasticobservability/apm-agent-python-testing:${1}" \
+    --cache-from="${full_image_name}" \
     --build-arg PYTHON_IMAGE="${1/-/:}" \
-    --tag "elasticobservability/apm-agent-python-testing:${1}" \
+    --tag "${full_image_name}" \
     .
 fi
 
@@ -67,6 +70,8 @@ PYTHON_VERSION=${1} docker compose run \
   -e WITH_COVERAGE=true \
   -e CASS_DRIVER_NO_EXTENSIONS=1 \
   -e PYTEST_JUNIT="--junitxml=/app/tests/docker-${1}-${2}-python-agent-junit.xml" \
+  -e REGISTRY=${REGISTRY} \
+  -e IMAGE_NAME=${IMAGE_NAME} \
   -v ${pip_cache}:$(dirname ${docker_pip_cache}) \
   -v "$(dirname $(pwd))":/app \
   --rm run_tests \