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

Update CI files from main branch

Author: gerrod3

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-198-g8f49b35
+2021.08.26-202-g6f2c165

.github/workflows/scripts/before_install.sh

@@ -30,11 +30,8 @@ fi
 COMMIT_MSG=$(git log --format=%B --no-merges -1)
 export COMMIT_MSG
 
-if [[ "$TEST" == "plugin-from-pypi" ]]; then
-  COMPONENT_VERSION=$(http https://pypi.org/pypi/pulp-python/json | jq -r '.info.version')
-else
-  COMPONENT_VERSION=$(sed -ne "s/\s*version.*=.*['\"]\(.*\)['\"][\s,]*/\1/p" setup.py)
-fi
+COMPONENT_VERSION=$(sed -ne "s/\s*version.*=.*['\"]\(.*\)['\"][\s,]*/\1/p" setup.py)
+
 mkdir .ci/ansible/vars || true
 echo "---" > .ci/ansible/vars/main.yaml
 echo "legacy_component_name: pulp_python" >> .ci/ansible/vars/main.yaml
@@ -63,22 +60,10 @@ cd ..
 
 git clone --depth=1 https://github.com/pulp/pulp-openapi-generator.git
 
+pip install pulp-cli
 
-if [ -f ../clitest_requirement.txt ]
-then
-  pip install -r clitest_requirements.txt
-else
-  pip install pulp-cli
-fi
-PULP_CLI_VERSION="$(python -c "from pulpcore.cli.common import __version__; print(__version__)")"
-git clone https://github.com/pulp/pulp-cli.git
-cd pulp-cli
-git checkout "$PULP_CLI_VERSION"
-
-pulp config create --base-url https://pulp  --location tests/cli.toml
-mkdir ~/.config/pulp
-cp tests/cli.toml ~/.config/pulp/cli.toml
-cd ..
+PULP_CLI_VERSION="$(pip freeze | sed -n -e 's/pulp-cli==//p')"
+git clone --depth 1 --branch "$PULP_CLI_VERSION" https://github.com/pulp/pulp-cli.git
 
 
 # Intall requirements for ansible playbooks

.github/workflows/scripts/before_script.sh

@@ -36,7 +36,7 @@ tail -v -n +1 .ci/ansible/Containerfile
 cmd_prefix bash -c "echo '%wheel        ALL=(ALL)       NOPASSWD: ALL' > /etc/sudoers.d/nopasswd"
 cmd_prefix bash -c "usermod -a -G wheel pulp"
 
-SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "stream" "plugin-from-pypi" "generate-bindings" "lowerbounds")
+SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "stream" "generate-bindings" "lowerbounds")
 if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
   # Many functional tests require these
   cmd_prefix dnf install -yq lsof which
@@ -50,3 +50,7 @@ fi
 if [[ -f $POST_BEFORE_SCRIPT ]]; then
   source $POST_BEFORE_SCRIPT
 fi
+
+# Lots of plugins try to use this path, and throw warnings if they cannot access it.
+cmd_prefix mkdir /.pytest_cache
+cmd_prefix chown pulp:pulp /.pytest_cache

.github/workflows/scripts/install.sh

@@ -27,9 +27,7 @@ fi
 
 cd .ci/ansible/
 
-if [[ "$TEST" == "plugin-from-pypi" ]]; then
-  PLUGIN_NAME=pulp_python
-elif [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
+if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
   PLUGIN_NAME=./pulp_python/dist/pulp_python-$PLUGIN_VERSION-py3-none-any.whl
 else
   PLUGIN_NAME=./pulp_python
@@ -111,17 +109,20 @@ if [ "${PULP_API_ROOT:-}" ]; then
   sed -i -e '$a api_root: "'"$PULP_API_ROOT"'"' vars/main.yaml
 fi
 
+pulp config create --base-url https://pulp --api-root "$PULP_API_ROOT"
+cp ~/.config/pulp/cli.toml "${REPO_ROOT}/../pulp-cli/tests/cli.toml"
+
 ansible-playbook build_container.yaml
 ansible-playbook start_container.yaml
 
 # .config needs to be accessible by the pulp user in the container, but some
 # files will likely be modified on the host by post/pre scripts.
 chmod 777 ~/.config/pulp_smash/
 chmod 666 ~/.config/pulp_smash/settings.json
-sudo chown -R 700:700 ~runner/.config
 # Plugins often write to ~/.config/pulp/cli.toml from the host
-sudo chmod 777 ~runner/.config/pulp
-sudo chmod 666 ~runner/.config/pulp/cli.toml
+chmod 777 ~/.config/pulp
+chmod 666 ~/.config/pulp/cli.toml
+sudo chown -R 700:700 ~/.config
 echo ::group::SSL
 # Copy pulp CA
 sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certificates/pulp_webserver.crt

.github/workflows/scripts/publish_docs.sh

@@ -17,8 +17,8 @@ touch ~/.ssh/pulp-infra
 chmod 600 ~/.ssh/pulp-infra
 echo "$PULP_DOCS_KEY" > ~/.ssh/pulp-infra
 
-echo "docs.pulpproject.org,8.43.85.236 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGXG+8vjSQvnAkq33i0XWgpSrbco3rRqNZr0SfVeiqFI7RN/VznwXMioDDhc+hQtgVhd6TYBOrV07IMcKj+FAzg=" >> /home/runner/.ssh/known_hosts
-chmod 644 /home/runner/.ssh/known_hosts
+echo "docs.pulpproject.org,8.43.85.236 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGXG+8vjSQvnAkq33i0XWgpSrbco3rRqNZr0SfVeiqFI7RN/VznwXMioDDhc+hQtgVhd6TYBOrV07IMcKj+FAzg=" >> ~/.ssh/known_hosts
+chmod 644 ~/.ssh/known_hosts
 
 pip3 install packaging
 

.github/workflows/scripts/script.sh

@@ -8,12 +8,12 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
+set -mveuo pipefail
+
 # make sure this script runs at the repo root
 cd "$(dirname "$(realpath -e "$0")")"/../../..
 REPO_ROOT="$PWD"
 
-set -mveuo pipefail
-
 source .github/workflows/scripts/utils.sh
 
 export POST_SCRIPT=$PWD/.github/workflows/scripts/post_script.sh
@@ -44,10 +44,10 @@ if [[ "$TEST" = "docs" ]]; then
   exit
 fi
 
+REPORTED_STATUS="$(pulp status)"
+
 if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
-  STATUS_ENDPOINT="${PULP_URL}${PULP_API_ROOT}api/v3/status/"
-  echo $STATUS_ENDPOINT
-  REPORTED_VERSION=$(http $STATUS_ENDPOINT | jq --arg plugin python --arg legacy_plugin pulp_python -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version')
+  REPORTED_VERSION="$(echo $REPORTED_STATUS | jq --arg plugin python --arg legacy_plugin pulp_python -r '.versions[] | select(.component == $plugin or .component == $legacy_plugin) | .version')"
   response=$(curl --write-out %{http_code} --silent --output /dev/null https://pypi.org/project/pulp-python/$REPORTED_VERSION/)
   if [ "$response" == "200" ];
   then
@@ -56,11 +56,6 @@ if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then
   fi
 fi
 
-if [[ "$TEST" == "plugin-from-pypi" ]]; then
-  COMPONENT_VERSION=$(http https://pypi.org/pypi/pulp-python/json | jq -r '.info.version')
-  git checkout ${COMPONENT_VERSION} -- pulp_python/tests/
-fi
-
 echo "machine pulp
 login admin
 password password
@@ -69,12 +64,13 @@ password password
 cmd_user_stdin_prefix bash -c "chmod 600 ~pulp/.netrc"
 
 cd ../pulp-openapi-generator
-./generate.sh pulp_python python
-cmd_prefix pip3 install /root/pulp-openapi-generator/pulp_python-client
-sudo rm -rf ./pulp_python-client
-./generate.sh pulpcore python
-cmd_prefix pip3 install /root/pulp-openapi-generator/pulpcore-client
-sudo rm -rf ./pulpcore-client
+for item in $(echo "$REPORTED_STATUS" | jq -r '.versions[].package|sub("-"; "_")')
+do
+./generate.sh "${item}" python
+cmd_prefix pip3 install "/root/pulp-openapi-generator/${item}-client"
+sudo rm -rf "./${item}-client"
+done
+
 cd $REPO_ROOT
 
 cat unittest_requirements.txt | cmd_stdin_prefix bash -c "cat > /tmp/unittest_requirements.txt"

template_config.yml

@@ -1,22 +1,21 @@
 # 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]198-g8f49b35
+# generated with [email protected]202-g6f2c165
 
 additional_repos: []
-aiohttp_fixtures_origin: 172.18.0.1
 api_root: /pulp/
 black: false
 check_commit_message: true
 check_gettext: true
 check_manifest: true
-check_openapi_schema: true
 check_stray_pulpcore_imports: true
 ci_env: {}
 ci_trigger: '{pull_request: {branches: [''*'']}}'
 ci_update_branches: []
+cli_package: pulp-cli
+cli_repo: https://github.com/pulp/pulp-cli.git
 core_import_allowed: []
-coverage: false
 deploy_client_to_pypi: true
 deploy_client_to_rubygems: true
 deploy_to_pypi: true
@@ -52,9 +51,6 @@ pulp_settings_azure: null
 pulp_settings_gcp: null
 pulp_settings_s3: null
 pulp_settings_stream: null
-pulpcore_branch: main
-pulpcore_pip_version_specifier: null
-pulpcore_revision: null
 pulpprojectdotorg_key_id: null
 pydocstyle: true
 pypi_username: pulp
@@ -69,13 +65,11 @@ stalebot_days_until_stale: 90
 stalebot_limit_to_pulls: true
 sync_ci: true
 test_azure: true
-test_bindings: false
 test_cli: true
 test_deprecations: true
 test_gcp: false
 test_lowerbounds: true
 test_performance: false
-test_released_plugin_with_next_pulpcore_release: false
 test_reroute: true
 test_s3: true
 test_stream: false