Update CI files

[noissue]
pulp · Jul 7, 2024 · 4b54f2d · 4b54f2d
1 parent e904a64
commit 4b54f2d
Show file tree

Hide file tree

Showing 18 changed files with 211 additions and 676 deletions.
diff --git a/.ci/ansible/Containerfile.j2 b/.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() %}

diff --git a/.ci/assets/ci_constraints.txt b/.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.
diff --git a/.ci/scripts/changelog.py b/.ci/scripts/changelog.py
diff --git a/.ci/scripts/tweet.py b/.ci/scripts/tweet.py
diff --git a/.ci/scripts/update_ci_branches.py b/.ci/scripts/update_ci_branches.py
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-339-gf0d923e
+2021.08.26-349-gba81617
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,18 +23,30 @@ jobs:
         with:
           fetch-depth: 1
           path: "pulp_python"
+      - 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_python-*-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 "python" --file "python-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_python/api.json
+            pulp_python/python-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_python/python-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_python/python-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_python/python-ruby-client.tar
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
+...
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,131 +19,10 @@ defaults:
 jobs:
   build:
     uses: "./.github/workflows/build.yml"
-
-  build-bindings-docs:
-    needs:
-      - "build"
-    runs-on: "ubuntu-latest"
-    # Install scripts expect TEST to be set, 'docs' is most appropriate even though we don't run tests
-    env:
-      TEST: "docs"
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-          path: "pulp_python"
-
-      - 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"
-
-      - uses: "actions/download-artifact@v4"
-        with:
-          name: "plugin_package"
-          path: "pulp_python/dist/"
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "2.6"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install towncrier twine wheel httpie docker netaddr boto3 ansible mkdocs
-          echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulp_python/.ci/assets/httpie/" >> $GITHUB_ENV
-          echo ::endgroup::
-
-      # Building the bindings and docs requires accessing the OpenAPI specs endpoint, so we need to
-      # setup the Pulp instance.
-      - name: "Before Install"
-        run: |
-          .github/workflows/scripts/before_install.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: "Install"
-        run: |
-          .github/workflows/scripts/install.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: "Install Python client"
-        run: |
-          .github/workflows/scripts/install_python_client.sh
-        shell: "bash"
-      - name: "Install Ruby client"
-        run: |
-          .github/workflows/scripts/install_ruby_client.sh
-        shell: "bash"
-
-      - name: "Upload python client packages"
-        uses: "actions/upload-artifact@v4"
-        with:
-          name: "python-client.tar"
-          path: |
-            pulp_python/python-python-client.tar
-          if-no-files-found: "error"
-          overwrite: true
-
-      - name: "Upload python client docs"
-        uses: "actions/upload-artifact@v4"
-        with:
-          name: "python-client-docs.tar"
-          path: |
-            pulp_python/python-python-client-docs.tar
-          if-no-files-found: "error"
-          overwrite: true
-      - name: "Upload ruby client packages"
-        uses: "actions/upload-artifact@v4"
-        with:
-          name: "ruby-client.tar"
-          path: |
-            pulp_python/python-ruby-client.tar
-          if-no-files-found: "error"
-          overwrite: true
-      - name: Build docs
-        run: |
-          export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
-          export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py
-          make -C docs/ PULP_URL="https://pulp" diagrams html
-          tar -cvf docs/docs.tar docs/_build
-
-      - name: "Upload built docs"
-        uses: actions/upload-artifact@v4
-        with:
-          name: "docs.tar"
-          path: "pulp_python/docs/docs.tar"
-          if-no-files-found: "error"
-          overwrite: true
-
-      - name: "Logs"
-        if: always()
-        run: |
-          echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate"
-          http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true
-          docker images || true
-          docker ps -a || true
-          docker logs pulp || true
-          docker exec pulp ls -latr /etc/yum.repos.d/ || true
-          docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
   publish-package:
     runs-on: "ubuntu-latest"
     needs:
-      - "build-bindings-docs"
+      - "build"
 
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
@@ -181,7 +60,7 @@ jobs:
   publish-python-bindings:
     runs-on: "ubuntu-latest"
     needs:
-      - "build-bindings-docs"
+      - "build"
 
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
@@ -224,7 +103,7 @@ jobs:
   publish-ruby-bindings:
     runs-on: "ubuntu-latest"
     needs:
-      - "build-bindings-docs"
+      - "build"
 
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
@@ -261,7 +140,7 @@ jobs:
   publish-docs:
     runs-on: "ubuntu-latest"
     needs:
-      - "build-bindings-docs"
+      - "build"
 
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
@@ -308,7 +187,7 @@ jobs:
   create-gh-release:
     runs-on: "ubuntu-latest"
     needs:
-      - "build-bindings-docs"
+      - "build"
       - "publish-package"
       - "publish-python-bindings"
       - "publish-ruby-bindings"