ansible · webknjaz · Nov 20, 2024
diff --git a/Makefile b/Makefile
@@ -174,7 +174,10 @@ requirements_awx: virtualenv_awx
 	if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \
 	    cat requirements/requirements.txt requirements/requirements_local.txt | $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) -r /dev/stdin ; \
 	else \
-	    cat requirements/requirements.txt requirements/requirements_git.txt | $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) -r /dev/stdin ; \
+	    $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --no-binary $(SRC_ONLY_PKGS) \
+	        -r requirements/requirements.txt \
+	        -r requirements/requirements_git.txt \
+	        -c requirements/git-constraints.txt ; \
 	fi
 	$(VENV_BASE)/awx/bin/pip uninstall --yes -r requirements/requirements_tower_uninstall.txt
 

diff --git a/requirements/git-constraints.txt b/requirements/git-constraints.txt
@@ -0,0 +1,2 @@
+awx-plugins-core @ git+https://github.com/ansible/awx-plugins.git
+awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -2,6 +2,8 @@ aiohttp>=3.9.4 # CVE-2024-30251
 ansi2html  # Used to format the stdout from jobs into html for display
 asciichartpy
 asn1
+awx-plugins-core
+awx_plugins.interfaces
 azure-identity
 azure-keyvault
 boto3

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -41,10 +41,10 @@ autocommand==2.2.2
     # via jaraco-text
 automat==22.10.0
     # via twisted
-# awx-plugins-core @ git+https://[email protected]/ansible/awx-plugins.git@devel  # git requirements installed separately
-    # via -r /awx_devel/requirements/requirements_git.txt
-awx-plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
-    # via -r /awx_devel/requirements/requirements_git.txt
+awx-plugins-core==0.0.1a7
+    # via -r /awx_devel/requirements/requirements.in
+awx-plugins-interfaces==0.0.1a1
+    # via -r /awx_devel/requirements/requirements.in
 azure-common==1.1.28
     # via
     #   azure-keyvault-certificates

diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt
@@ -2,5 +2,3 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
 # Remove pbr from requirements.in when moving ansible-runner to requirements.in
 git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
 django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest_filters,jwt_consumer,resource_registry,rbac]
-awx-plugins-core @ git+https://[email protected]/ansible/awx-plugins.git@devel#egg=awx-plugins-core
-awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -74,6 +74,7 @@ RUN mkdir /tmp/requirements
 ADD requirements/requirements.txt \
     requirements/requirements_tower_uninstall.txt \
     requirements/requirements_git.txt \
+    requirements/git-constraints.txt \
     /tmp/requirements/
 
 RUN cd /tmp && make requirements_awx
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		awx-plugins-core @ git+https://github.com/ansible/awx-plugins.git
		awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git