Update CI files

[noissue]
pulp · Jun 23, 2024 · e45e45c · e45e45c
1 parent a8b206f
commit e45e45c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 57 deletions.
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-339-gf0d923e
+2021.08.26-342-g13e7dc5
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,6 +35,13 @@ jobs:
         run: |
           python3 setup.py sdist bdist_wheel --python-tag py3
           twine check dist/*
+      - name: "Install built packages"
+        run: |
+          pip install dist/pulp_rpm-*-py3-none-any.whl
+      - name: "Generate api specs"
+        run: |
+          pulpcore-manager openapi --file "api.json"
+          pulpcore-manager openapi --bindings --component "rpm" --file "rpm-api.json"
       - name: "Upload Package whl"
         uses: "actions/upload-artifact@v4"
         with:
@@ -43,3 +50,13 @@ 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_rpm/api.json
+            pulp_rpm/rpm-api.json
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
@@ -54,64 +54,38 @@ cmd_prefix bash -c "chmod 600 ~pulp/.netrc"
 
 # Generate and install binding
 pushd ../pulp-openapi-generator
-if pulp debug has-plugin --name "core" --specifier ">=3.44.0.dev"
-then
-  # Use app_label to generate api.json and package to produce the proper package name.
+# Use app_label to generate api.json and package to produce the proper package name.
 
-  if [ "$(jq -r '.domain_enabled' <<<"$REPORTED_STATUS")" = "true" ]
-  then
-    # Workaround: Domains are not supported by the published bindings.
-    # Generate new bindings for all packages.
-    for item in $(jq -r '.versions[] | tojson' <<<"$REPORTED_STATUS")
-    do
-      echo $item
-      COMPONENT="$(jq -r '.component' <<<"$item")"
-      VERSION="$(jq -r '.version' <<<"$item")"
-      MODULE="$(jq -r '.module' <<<"$item")"
-      PACKAGE="${MODULE%%.*}"
-      curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=$COMPONENT"
-      USE_LOCAL_API_JSON=1 ./generate.sh "${PACKAGE}" python "${VERSION}"
-      cmd_prefix pip3 install "/root/pulp-openapi-generator/${PACKAGE}-client"
-      sudo rm -rf "./${PACKAGE}-client"
-    done
-  else
-    # Sadly: Different pulpcore-versions aren't either...
-    for item in $(jq -r '.versions[]| select(.component!="rpm")| tojson' <<<"$REPORTED_STATUS")
-    do
-      echo $item
-      COMPONENT="$(jq -r '.component' <<<"$item")"
-      VERSION="$(jq -r '.version' <<<"$item")"
-      MODULE="$(jq -r '.module' <<<"$item")"
-      PACKAGE="${MODULE%%.*}"
-      curl --fail-with-body -k -o api.json "${PULP_URL}${PULP_API_ROOT}api/v3/docs/api.json?bindings&component=$COMPONENT"
-      USE_LOCAL_API_JSON=1 ./generate.sh "${PACKAGE}" python "${VERSION}"
-      cmd_prefix pip3 install "/root/pulp-openapi-generator/${PACKAGE}-client"
-      sudo rm -rf "./${PACKAGE}-client"
-    done
-  fi
+if [ "$(jq -r '.domain_enabled' <<<"$REPORTED_STATUS")" = "true" ]
+then
+  # Workaround: Domains are not supported by the published bindings.
+  # Generate new bindings for all packages.
+  for item in $(jq -r '.versions[] | tojson' <<<"$REPORTED_STATUS")
+  do
+    echo $item
+    COMPONENT="$(jq -r '.component' <<<"$item")"
+    VERSION="$(jq -r '.version' <<<"$item")"
+    MODULE="$(jq -r '.module' <<<"$item")"
+    PACKAGE="${MODULE%%.*}"
+    cmd_prefix pulpcore-manager openapi --bindings --component "${COMPONENT}" > api.json
+    ./gen-client.sh api.json "${COMPONENT}" python "${PACKAGE}"
+    cmd_prefix pip3 install "/root/pulp-openapi-generator/${PACKAGE}-client"
+    sudo rm -rf "./${PACKAGE}-client"
+  done
 else
-  # Infer the client name from the package name by replacing "-" with "_".
-  # Use the component to infer the package name on older versions of pulpcore.
-
-  if [ "$(echo "$REPORTED_STATUS" | jq -r '.domain_enabled')" = "true" ]
-  then
-    # Workaround: Domains are not supported by the published bindings.
-    # Generate new bindings for all packages.
-    for item in $(echo "$REPORTED_STATUS" | jq -r '.versions[]|(.package // ("pulp_" + .component)|sub("pulp_core"; "pulpcore"))|sub("-"; "_")')
-    do
-      ./generate.sh "${item}" python
-      cmd_prefix pip3 install "/root/pulp-openapi-generator/${item}-client"
-      sudo rm -rf "./${item}-client"
-    done
-  else
-    # Sadly: Different pulpcore-versions aren't either...
-    for item in $(echo "$REPORTED_STATUS" | jq -r '.versions[]|select(.component!="rpm")|(.package // ("pulp_" + .component)|sub("pulp_core"; "pulpcore"))|sub("-"; "_")')
-    do
-      ./generate.sh "${item}" python
-      cmd_prefix pip3 install "/root/pulp-openapi-generator/${item}-client"
-      sudo rm -rf "./${item}-client"
-    done
-  fi
+  # Sadly: Different pulpcore-versions aren't either...
+  for item in $(jq -r '.versions[]| select(.component!="rpm")| tojson' <<<"$REPORTED_STATUS")
+  do
+    echo $item
+    COMPONENT="$(jq -r '.component' <<<"$item")"
+    VERSION="$(jq -r '.version' <<<"$item")"
+    MODULE="$(jq -r '.module' <<<"$item")"
+    PACKAGE="${MODULE%%.*}"
+    cmd_prefix pulpcore-manager openapi --bindings --component "${COMPONENT}" > api.json
+    ./gen-client.sh api.json "${COMPONENT}" python "${PACKAGE}"
+    cmd_prefix pip3 install "/root/pulp-openapi-generator/${PACKAGE}-client"
+    sudo rm -rf "./${PACKAGE}-client"
+  done
 fi
 popd