Merge pull request #750 from pulp/create-pull-request/main/patch

Update CI files from main branch

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-208-ge0fb194
+2021.08.26-212-g18b9346

.github/workflows/scripts/before_install.sh

@@ -60,9 +60,6 @@ cd ..
 
 git clone --depth=1 https://github.com/pulp/pulp-openapi-generator.git
 
-pip install pulp-cli
-
-
 # Intall requirements for ansible playbooks
 pip install docker netaddr boto3 ansible
 

.github/workflows/scripts/install.sh

@@ -17,14 +17,16 @@ source .github/workflows/scripts/utils.sh
 
 export PULP_API_ROOT="/pulp/"
 
-if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then
-  cd ..
-  git clone https://github.com/pulp/pulpcore.git
-  cd -
-  pip install -r ../pulpcore/doc_requirements.txt
-  pip install -r doc_requirements.txt
+PIP_REQUIREMENTS=("pulp-cli")
+if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]
+then
+  PIP_REQUIREMENTS+=("-r" "doc_requirements.txt")
 fi
 
+pip install ${PIP_REQUIREMENTS[*]}
+
+
+
 cd .ci/ansible/
 
 if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then

.github/workflows/scripts/script.sh

@@ -99,7 +99,7 @@ cmd_prefix bash -c "cat /etc/pulp/certs/pulp_webserver.crt  | tee -a "$CERTIFI"
 
 # check for any uncommitted migrations
 echo "Checking for uncommitted migrations..."
-cmd_user_prefix bash -c "django-admin makemigrations --check --dry-run"
+cmd_user_prefix bash -c "django-admin makemigrations deb --check --dry-run"
 
 # Run unit tests.
 cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_deb.tests.unit"

template_config.yml

@@ -1,7 +1,7 @@
 # This config represents the latest values used when running the plugin-template. Any settings that
 # were not present before running plugin-template have been added with their default values.
 
-# generated with [email protected]207-g81d81f6
+# generated with [email protected]212-g18b9346
 
 additional_repos: []
 api_root: /pulp/
@@ -23,6 +23,7 @@ deploy_client_to_pypi: true
 deploy_client_to_rubygems: true
 deploy_to_pypi: true
 disabled_redis_runners: []
+doc_requirements_from_pulpcore: false
 docker_fixtures: true
 docs_test: true
 flake8: true