Update CI files for branch 2.20

.ci/ansible/Containerfile.j2

@@ -22,6 +22,7 @@ RUN pip3 install
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}
 {%- endfor %}
+{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt
 
 {% if pulp_env is defined and pulp_env %}
 {% for key, value in pulp_env.items() %}

.ci/assets/ci_constraints.txt

@@ -0,0 +1,7 @@
+# Pulpcore versions without the openapi command do no longer work in the CI
+pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*,!=3.31.*,!=3.32.*,!=3.33.*,!=3.34.*,!=3.35.*,!=3.36.*,!=3.37.*,!=3.38.*,!=3.40.*,!=3.41.*,!=3.42.*,!=3.43.*,!=3.44.*,!=3.45.*,!=3.46.*,!=3.47.*,!=3.48.*,!=3.50.*,!=3.51.*,!=3.52.*,!=3.53.*,!=3.54.*
+
+
+
+tablib!=3.6.0
+# 3.6.0: This release introduced a regression removing the "html" optional dependency.

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-341-g5cb6e90
+2021.08.26-348-g88c805d

.github/workflows/build.yml

@@ -23,18 +23,30 @@ jobs:
         with:
           fetch-depth: 1
           path: "pulp_container"
+      - uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 1
+          repository: "pulp/pulp-openapi-generator"
+          path: "pulp-openapi-generator"
       - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install packaging twine wheel
+          pip install packaging twine wheel mkdocs jq
           echo ::endgroup::
       - name: "Build package"
         run: |
           python3 setup.py sdist bdist_wheel --python-tag py3
           twine check dist/*
+      - name: "Install built packages"
+        run: |
+          pip install dist/pulp_container-*-py3-none-any.whl -c .ci/assets/ci_constraints.txt
+      - name: "Generate api specs"
+        run: |
+          pulpcore-manager openapi --file "api.json"
+          pulpcore-manager openapi --bindings --component "container" --file "container-api.json"
       - name: "Upload Package whl"
         uses: "actions/upload-artifact@v4"
         with:
@@ -43,3 +55,59 @@ jobs:
           if-no-files-found: "error"
           retention-days: 5
           overwrite: true
+      - name: "Upload API specs"
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: "api_spec"
+          path: |
+            pulp_container/api.json
+            pulp_container/container-api.json
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
+      - name: "Build Python bindings packages"
+        run: |
+          .github/workflows/scripts/build_python_client.sh
+        shell: "bash"
+        env:
+          PY_COLORS: "1"
+          ANSIBLE_FORCE_COLOR: "1"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
+      - name: "Upload python client packages"
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: "python-client.tar"
+          path: |
+            pulp_container/container-python-client.tar
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
+      - name: "Upload python client docs"
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: "python-client-docs.tar"
+          path: |
+            pulp_container/container-python-client-docs.tar
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
+      - name: "Build Ruby bindings packages"
+        run: |
+          .github/workflows/scripts/build_ruby_client.sh
+        shell: "bash"
+        env:
+          PY_COLORS: "1"
+          ANSIBLE_FORCE_COLOR: "1"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
+      - name: "Upload Ruby client"
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: "ruby-client.tar"
+          path: |
+            pulp_container/container-ruby-client.tar
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
+...

.github/workflows/scripts/install_python_client.sh → .github/workflows/scripts/build_python_client.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This script expects all <app_label>-api.json files to exist in the plugins root directory.
+# It produces a <app_label>-python-client.tar and <app_label>-python-client-docs.tar file in the plugins root directory.
+
 # WARNING: DO NOT EDIT!
 #
 # This file was generated by plugin_template, and is managed by it. Please use
@@ -12,36 +15,20 @@ set -mveuo pipefail
 # make sure this script runs at the repo root
 cd "$(dirname "$(realpath -e "$0")")"/../../..
 
-source .github/workflows/scripts/utils.sh
-
-PULP_URL="${PULP_URL:-https://pulp}"
-export PULP_URL
-PULP_API_ROOT="${PULP_API_ROOT:-/pulp/}"
-export PULP_API_ROOT
-
-REPORTED_STATUS="$(pulp status)"
-REPORTED_VERSION="$(echo "$REPORTED_STATUS" | jq --arg plugin "container" -r '.versions[] | select(.component == $plugin) | .version')"
-VERSION="$(echo "$REPORTED_VERSION" | python -c 'from packaging.version import Version; print(Version(input()))')"
-
 pushd ../pulp-openapi-generator
-rm -rf pulp_container-client
+rm -rf "pulp_container-client"
 
-if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev"
-then
-  curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=container"
-  USE_LOCAL_API_JSON=1 ./generate.sh pulp_container python "$VERSION"
-else
-  ./generate.sh pulp_container python "$VERSION"
-fi
+# We need to copy that over to be visible in the container.
+cp "../pulp_container/container-api.json" .
+./gen-client.sh "container-api.json" "container" python "pulp_container"
 
 pushd pulp_container-client
 python setup.py sdist bdist_wheel --python-tag py3
 
-twine check "dist/pulp_container_client-$VERSION-py3-none-any.whl"
-twine check "dist/pulp_container-client-$VERSION.tar.gz"
+twine check "dist/pulp_container_client-"*"-py3-none-any.whl"
+twine check "dist/pulp_container-client-"*".tar.gz"
 
-cmd_prefix pip3 install "/root/pulp-openapi-generator/pulp_container-client/dist/pulp_container_client-${VERSION}-py3-none-any.whl"
-tar cvf ../../pulp_container/container-python-client.tar ./dist
+tar cvf "../../pulp_container/container-python-client.tar" ./dist
 
 find ./docs/* -exec sed -i 's/Back to README/Back to HOME/g' {} \;
 find ./docs/* -exec sed -i 's/README//g' {} \;

.github/workflows/scripts/build_ruby_client.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# This script expects all <app_label>-api.json files to exist in the plugins root directory.
+# It produces a <app_label>-ruby-client.tar file in the plugins root directory.
+
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulp_container' to update this file.
+#
+# 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")")"/../../..
+
+pushd ../pulp-openapi-generator
+rm -rf "pulp_container-client"
+
+# We need to copy that over to be visible in the container.
+#cp "../pulp_container/container-api.json" .
+#./gen-client.sh "container-api.json" "container" ruby "pulp_container"
+
+# -------------
+# The generator still needs to have it called api.json at this time...
+cp "../pulp_container/api.json" .
+./gen-client.sh "api.json" "container" ruby "pulp_container"
+# -------------
+
+pushd pulp_container-client
+gem build pulp_container_client
+tar cvf "../../pulp_container/container-ruby-client.tar" "./pulp_container_client-"*".gem"
+popd
+popd

.github/workflows/scripts/install.sh

@@ -79,7 +79,7 @@ cat >> vars/main.yaml << VARSYAML
 pulp_env: {}
 pulp_settings: {"allowed_content_checksums": ["sha1", "sha224", "sha256", "sha384", "sha512"], "allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "flatpak_index": true}
 pulp_scheme: https
-pulp_default_container: ghcr.io/pulp/pulp-ci-centos:latest
+pulp_default_container: ghcr.io/pulp/pulp-ci-centos9:latest
 VARSYAML
 
 if [ "$TEST" = "s3" ]; then

.github/workflows/scripts/post_before_script.sh

@@ -3,3 +3,10 @@ if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
   # Needed by pulp_container/tests/functional/api/test_flatpak.py:
   cmd_prefix dnf install -yq dbus-daemon flatpak
 fi
+
+# add the copied certificates from install.sh to the container's trusted certificates list
+if [[ "$TEST" = "azure" ]]; then
+  cmd_prefix sudo trust anchor /etc/pki/tls/cert.pem
+else
+  cmd_prefix sudo trust anchor /etc/pulp/certs/pulp_webserver.crt
+fi