Merge pull request #389 from gerrod3/template-update-and-docs-move

Update template config and publish docs to pulpproject.org

Author: gerrod3

.ci/ansible/settings.py.j2

@@ -3,7 +3,7 @@ ANSIBLE_API_HOSTNAME = "http://pulp:80"
 ANSIBLE_CONTENT_HOSTNAME = "http://pulp:80/pulp/content"
 PRIVATE_KEY_PATH = "/etc/pulp/certs/token_private_key.pem"
 PUBLIC_KEY_PATH = "/etc/pulp/certs/token_public_key.pem"
-TOKEN_SERVER = "http://pulp:80/token"
+TOKEN_SERVER = "http://pulp:80/token/"
 TOKEN_SIGNATURE_ALGORITHM = "ES256"
 
 {% if pulp_settings %}

.ci/scripts/cherrypick.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulp_python' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+set -e
+
+if [ $# -lt 3 ]
+then
+  echo "Usage: .ci/scripts/cherrypick.sh [commit-hash] [original-issue-id] [backport-issue-id]"
+  echo "   ex: .ci/scripts/cherrypick.sh abcd1234 1234 4567"
+  echo ""
+  echo "Note: make sure you are on a fork of the release branch before running this script."
+  exit
+fi
+
+commit="$(git rev-parse $1)"
+issue="$2"
+backport="$3"
+commit_message=$(git log --format=%B -n 1 $commit)
+
+if ! echo $commit_message | tr '[:upper:]' '[:lower:]' | grep -q "\[noissue\]"
+then
+  if ! echo $commit_message | tr '[:upper:]' '[:lower:]' | grep -q -E "(fixes|closes).*#$issue"
+  then
+    echo "Error: issue $issue not detected in commit message." && exit 1
+  fi
+fi
+
+if [ "$4" = "--continue" ]
+then
+  echo "Continue after manually resolving conflicts..."
+elif [ "$4" = "" ]
+then
+  if ! git cherry-pick --no-commit "$commit"
+  then
+    echo "Please resolve and add merge conflicts and restart this command with appended '--continue'."
+    exit 1
+  fi
+else
+  exit 1
+fi
+
+for file in $(find CHANGES -name "$issue.*")
+do
+  newfile="${file/$issue/$backport}"
+  git mv "$file" "$newfile"
+  sed -i -e "\$a (backported from #$issue)" "$newfile"
+  git add "$newfile"
+done
+
+commit_message="$(printf "$commit_message" | sed -E 's/(fixes|closes)/backports/i')"
+commit_message="$commit_message
+
+fixes #$backport
+
+(cherry picked from commit $commit)"
+git commit -m "$commit_message"
+
+printf "\nSuccessfully backported commit $1.\n"

.ci/scripts/publish_plugin_pypi.sh

@@ -12,10 +12,15 @@
 
 REDMINE_API_KEY = os.environ["REDMINE_API_KEY"]
 REDMINE_QUERY_URL = sys.argv[1]
+MILESTONE_URL = sys.argv[2]
+RELEASE = sys.argv[3]
 CLOSED_CURRENTRELEASE = 11
 
 redmine = Redmine(REDMINE_QUERY_URL.split("issues")[0], key=REDMINE_API_KEY)
 query_issues = REDMINE_QUERY_URL.split("=")[-1].split(",")
+milestone_name = redmine.version.get(MILESTONE_URL.split("/")[-1].split(".")[0]).name
+if milestone_name != RELEASE:
+    raise RuntimeError(f"Milestone name, '{milestone_name}', does not match version, '{RELEASE}'.")
 
 to_update = []
 for issue in query_issues:

.ci/scripts/redmine.py

@@ -21,13 +21,6 @@ echo "Releasing $RELEASE"
 echo "Milestone URL: $MILESTONE_URL"
 echo "Query: $REDMINE_QUERY_URL"
 
-MILESTONE=$(http $MILESTONE_URL | jq -r .version.name)
-echo "Milestone: $MILESTONE"
+pip install python-redmine httpie
 
-if [[ "$MILESTONE" != "${RELEASE%.post*}" ]]; then
-  echo "Milestone $MILESTONE is not equal to Release $RELEASE"
-  exit 1
-fi
-
-pip install python-redmine
-python3 .ci/scripts/redmine.py $REDMINE_QUERY_URL
+python3 .ci/scripts/redmine.py $REDMINE_QUERY_URL $MILESTONE_URL $RELEASE

.ci/scripts/release.py

@@ -6,20 +6,22 @@
 # For more info visit https://github.com/pulp/plugin_template
 
 import re
-
 import subprocess
 import sys
 from pathlib import Path
 
+
 from github import Github
 
-KEYWORDS = ["fixes", "closes"]
+
 NO_ISSUE = "[noissue]"
 CHANGELOG_EXTS = [".feature", ".bugfix", ".doc", ".removal", ".misc", ".deprecation"]
 
+
+KEYWORDS = ["fixes", "closes"]
+
 sha = sys.argv[1]
 message = subprocess.check_output(["git", "log", "--format=%B", "-n 1", sha]).decode("utf-8")
-
 g = Github()
 repo = g.get_repo("pulp/pulp_python")
 

.ci/scripts/update_redmine.sh

@@ -10,9 +10,6 @@ on:
   pull_request:
     branches:
       - '*'
-  push:
-    branches:
-      - '*'
 
 jobs:
 
@@ -99,6 +96,13 @@ jobs:
           ANSIBLE_FORCE_COLOR: '1'
         shell: bash
 
+      - name: Install Python client
+        run: .github/workflows/scripts/install_python_client.sh
+
+      - name: Install Ruby client
+        if: ${{ env.TEST == 'bindings' }}
+        run: .github/workflows/scripts/install_ruby_client.sh
+
       - name: Before Script
         run: |
           .github/workflows/scripts/before_script.sh