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

Update CI files from main branch

Author: mdellweg

.ci/ansible/Containerfile.j2

@@ -3,7 +3,7 @@ FROM {{ ci_base | default("ghcr.io/pulp/pulp-ci-centos:" + pulp_container_tag) }
 # Add source directories to container
 {% for item in plugins %}
 {% if item.source.startswith("./") or item.ci_requirements | default(false) %}
-ADD {{ item.source }} {{ item.source }}
+ADD ./{{ item.name }} ./{{ item.name }}
 {% endif %}
 {% endfor %}
 

.ci/scripts/calc_deps_lowerbounds.py

@@ -19,8 +19,12 @@ def main():
             else:
                 for spec in requirement.specifier:
                     if spec.operator == ">=":
+                        if requirement.name == "pulpcore":
+                            operator = "~="
+                        else:
+                            operator = "=="
                         min_version = str(spec)[2:]
-                        print(f"{requirement.name}=={min_version}")
+                        print(f"{requirement.name}{operator}{min_version}")
                         break
                 else:
                     print(line.strip())

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-202-g6f2c165
+2021.08.26-207-g81d81f6

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
         run: python .github/workflows/scripts/release.py ${{ github.event.inputs.release }}
 
       - name: 'Tar files'
-        run: tar -cvf pulp_python.tar $GITHUB_WORKSPACE
+        run: tar -cvf pulp_python.tar .
 
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
@@ -95,9 +95,7 @@ jobs:
 
       - name: Untar repository
         run: |
-          shopt -s dotglob
           tar -xf pulp_python.tar
-          mv home/runner/work/pulp_python/pulp_python/* ./
 
       # update to the branch's latest ci files rather than the ones from the release tag. this is
       # helpful when there was a problem with the ci files during the release which needs to be
@@ -260,9 +258,7 @@ jobs:
 
       - name: Untar repository
         run: |
-          shopt -s dotglob
           tar -xf pulp_python.tar
-          mv home/runner/work/pulp_python/pulp_python/* ./
 
       # update to the branch's latest ci files rather than the ones from the release tag. this is
       # helpful when there was a problem with the ci files during the release which needs to be

.github/workflows/scripts/script.sh

@@ -64,12 +64,29 @@ password password
 cmd_user_stdin_prefix bash -c "chmod 600 ~pulp/.netrc"
 
 cd ../pulp-openapi-generator
-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
+if [ "$(echo "$REPORTED_STATUS" | jq -r '.versions[0].package')" = "null" ]
+then
+  # We are on an old version of pulpcore without package in the status report
+  for app_label in $(echo "$REPORTED_STATUS" | jq -r '.versions[].component')
+  do
+    if [ "$app_label" = "core" ]
+    then
+      item=pulpcore
+    else
+      item="pulp_${app_label}"
+    fi
+    ./generate.sh "${item}" python
+    cmd_prefix pip3 install "/root/pulp-openapi-generator/${item}-client"
+    sudo rm -rf "./${item}-client"
+  done
+else
+  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
+fi
 
 cd $REPO_ROOT