Pin dab to a tag by default. Allow environment variable override for the branch.

profiles/base/Dockerfile

@@ -1,4 +1,11 @@
 FROM localhost/oci_env/pulp:base
+
+# Define the build argument
+ARG DJANGO_ANSIBLE_BASE_BRANCH=2024.6.11
+
+# Set the environment variable based on the build argument
+ENV DJANGO_ANSIBLE_BASE_BRANCH=${DJANGO_ANSIBLE_BASE_BRANCH}
+
 RUN echo "fastestmirror=1" >> /etc/dnf/dnf.conf
 
 COPY . /opt/galaxy_ng/

profiles/base/compose.yaml

@@ -39,8 +39,8 @@ services:
     extra_hosts:
       localhost: "host-gateway"
     environment:
-      - PULP_WORKERS=1
-      #- LOCK_REQUIREMENTS=0
+      PULP_WORKERS: "1"
+      #LOCK_REQUIREMENTS=0
     volumes:
       - "pulp_certs:/etc/pulp/certs/"
     depends_on:

profiles/dab/compose.yaml

@@ -0,0 +1,20 @@
+---
+version: "3.7"
+
+services:
+
+  # pre installs all of the python dependencies, including for integration tests
+  _galaxy_base:
+    build:
+      args:
+        DJANGO_ANSIBLE_BASE_BRANCH: "devel"
+    environment:
+      DJANGO_ANSIBLE_BASE_BRANCH: "devel"
+
+  pulp:
+    environment:
+      PULP_WORKERS: "1"
+      DJANGO_ANSIBLE_BASE_BRANCH: "devel"
+
+volumes:
+  pulp_certs:

profiles/dab_jwt/compose.yaml

@@ -1,12 +1,20 @@
 ---
+version: "3.7"
+
 services:
-  jwtproxy:
+
+  # pre installs all of the python dependencies, including for integration tests
+  _galaxy_base:
     build:
-      context: "{SRC_DIR}/galaxy_ng/profiles/dab_jwt/proxy"
-    ports:
-      - "{JWT_PROXY_PORT}:{JWT_PROXY_PORT}"
+      args:
+        DJANGO_ANSIBLE_BASE_BRANCH: "devel"
     environment:
-      UPSTREAM_URL: "http://pulp:{API_PORT}"
-      PROXY_PORT: "{JWT_PROXY_PORT}"
-    volumes:
-      - "{SRC_DIR}/galaxy_ng/profiles/dab_jwt/proxy:/app:rw"
+      DJANGO_ANSIBLE_BASE_BRANCH: "devel"
+
+  pulp:
+    environment:
+      PULP_WORKERS: "1"
+      DJANGO_ANSIBLE_BASE_BRANCH: "devel"
+
+volumes:
+  pulp_certs:

requirements/requirements.common.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --output-file=requirements/requirements.common.txt setup.py
@@ -104,7 +104,7 @@ django==4.2.11
     #   insights-analytics-collector
     #   pulpcore
     #   social-auth-app-django
-django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel
+django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.6.11
     # via galaxy-ng (setup.py)
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)

requirements/requirements.insights.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py
@@ -118,7 +118,7 @@ django==4.2.11
     #   insights-analytics-collector
     #   pulpcore
     #   social-auth-app-django
-django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel
+django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.6.11
     # via galaxy-ng (setup.py)
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)

requirements/requirements.standalone.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --output-file=requirements/requirements.standalone.txt requirements/requirements.standalone.in setup.py
@@ -104,7 +104,7 @@ django==4.2.11
     #   insights-analytics-collector
     #   pulpcore
     #   social-auth-app-django
-django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel
+django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.6.11
     # via galaxy-ng (setup.py)
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)

setup.py

@@ -110,6 +110,12 @@ def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pul
         )
 
 
+django_ansible_base_branch = os.getenv('DJANGO_ANSIBLE_BASE_BRANCH', '2024.6.11')
+django_ansible_base_dependency = (
+    'django-ansible-base[jwt_consumer] @ '
+    f'git+https://github.com/ansible/django-ansible-base@{django_ansible_base_branch}'
+)
+
 requirements = [
     "galaxy-importer>=0.4.21,<0.5.0",
     "pulpcore>=3.49.0,<3.50.0",
@@ -124,7 +130,7 @@ def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pul
     "insights_analytics_collector>=0.3.0",
     "boto3",
     "distro",
-    "django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel",  # noqa 501
+    django_ansible_base_dependency,  # noqa 501
     "django-crum==0.7.9",
     # From vendored automated_logging
     "marshmallow<4.0.0,>=3.6.1",
@@ -153,8 +159,9 @@ def strip_package_name(spec):
     ref: https://github.com/ansible/galaxy_ng/wiki/Development-Setup
          #steps-to-run-dev-environment-with-specific-upstream-branch
     """
+    DEFAULT = "pulpcore:pulp_ansible:pulp_container:galaxy_importer:django-ansible-base"
     DEV_SOURCE_PATH = os.getenv(
-        "DEV_SOURCE_PATH", default="pulpcore:pulp_ansible:pulp_container:galaxy_importer"
+        "DEV_SOURCE_PATH", default=DEFAULT
     ).split(":")
     DEV_SOURCE_PATH += [path.replace("_", "-") for path in DEV_SOURCE_PATH]
     requirements = [