Hotfix openstack wait for fun utils v3005.1

.codecov.yml

@@ -1,6 +1,6 @@
 codecov:
   ci:
-    - jenkinsci.saltstack.com
+    - jenkins.saltproject.io
     - github.com
 
   max_report_age: 24           # The age you want coverage reports to expire at, or if you

.github/workflows/pr-checks.yml

@@ -45,7 +45,9 @@ jobs:
         shell: bash
         run: |
           set -o pipefail
-          pre-commit run -v --hook-stage manual check-known-missing-docstrings --show-diff-on-failure --color=never --files ${{ join(fromJSON(steps.changed-files.outputs.salt_files), ' ') }} | tee output.txt
+          pre-commit run --hook-stage manual check-known-missing-docstrings \
+            --show-diff-on-failure --color=never \
+            --files ${{ join(fromJSON(steps.changed-files.outputs.salt_files), ' ') }} | tee output.txt
 
       - name: Comment on PR
         # Comment on PRs if pre-commit triggered a failure

.github/workflows/release-tag.yml

@@ -0,0 +1,71 @@
+name: Generate Tag and Github Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      saltVersion:
+        description: 'Salt Version'
+        required: true
+      saltRepo:
+        description: 'Salt Repo'
+        default: saltstack/salt
+      saltBranch:
+        description: 'Salt Branch'
+        default: freeze
+      reTag:
+        description: 'Re Tag (Deletes tag and release)'
+        default: false
+
+jobs:
+  GenerateTagRelease:
+    name: Generate Tag and Github Release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: dev-drprasad/delete-tag-and-release@v0.2.0
+      if: github.event.inputs.reTag == 'true'
+      with:
+        delete_release: true # default: false
+        tag_name: v${{ github.event.inputs.saltVersion }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - uses: actions/checkout@v2
+      with:
+        repository: ${{ github.event.inputs.saltRepo }}
+        ref: ${{ github.event.inputs.saltBranch }}
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v5.6
+      with:
+        create_annotated_tag: True
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        custom_tag: ${{ github.event.inputs.saltVersion }}
+
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+
+    - uses: actions/checkout@v2
+    - name: Install pypa/build
+      run: |
+        python -m pip install build --user
+    - name: Build a binary wheel and a source tarball
+      run: |
+        git fetch --tags origin
+        git checkout v${{ github.event.inputs.saltVersion }}
+        chmod 700 conf/cloud.*.d
+        chmod 600 conf/cloud
+        chmod 600 conf/cloud.profiles
+        chmod 600 conf/cloud.providers
+        python3 setup.py --ssh-packaging sdist
+        python -m build --sdist --outdir dist/ .
+    - name: Create a GitHub release
+      uses: ncipollo/release-action@v1
+      with:
+        tag: ${{ steps.tag_version.outputs.new_tag }}
+        name: Release ${{ steps.tag_version.outputs.new_tag }}
+        body: |
+          WARNING: The tarball generated by GitHub will not have the correct version information when using a version not ending in .0 . Please use the tarball generated by SaltStack instead. See issue #41847 for more information.
+          Official Salt packages can be found at https://repo.saltproject.io/
+        artifacts: dist/salt*.tar.gz

.github/workflows/release.yml

@@ -0,0 +1,196 @@
+name: Generate Release Docs
+
+on:
+  workflow_dispatch:
+    inputs:
+      saltVersion:
+        description: 'Salt Version'
+        required: true
+      manPages:
+        description: "Build Man Pages"
+        default: true
+        required: false
+      branch:
+        description: "Branch to build/push PR"
+        default: "master"
+        required: false
+
+jobs:
+  SaltChangelog:
+    name: Build Salt Changelog
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      run: |
+        echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
+        apt-get update
+        apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
+        apt-get install -y git/buster-backports
+
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.inputs.branch }}
+        fetch-depth: 0
+
+    - name: Install Nox
+      env:
+        PIP_EXTRA_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+      run: |
+        python -m pip install --upgrade pip
+        pip install nox
+
+    - id: changed-files
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          docs:
+            - doc/**
+
+    - name: Install Python Requirements
+      env:
+        PIP_EXTRA_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+      run: |
+        nox --install-only --forcecolor -e 'changelog(force=True, draft=False)' -- ${{ github.event.inputs.saltVersion }}
+        nox --install-only --forcecolor -e 'changelog(force=False, draft=True)' -- ${{ github.event.inputs.saltVersion }}
+
+    - name: Build Changelog
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e 'changelog(force=False, draft=True)' -- ${{ github.event.inputs.saltVersion }} > rn_changelog
+        nox --forcecolor -e 'changelog(force=True, draft=False)' -- ${{ github.event.inputs.saltVersion }}
+        git restore --staged changelog/
+        git diff --no-color > rm_changelog_patch.txt
+
+    - name: Store Generated Changelog
+      uses: actions/upload-artifact@v2
+      with:
+        name: salt-changelog
+        path: |
+          CHANGELOG.md
+          rm_changelog_patch.txt
+          rn_changelog
+
+  Manpages:
+    name: Build Salt man Pages
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+
+    - name: Install System Deps
+      if: github.event.inputs.manPages == 'true'
+      run: |
+        echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
+        apt-get update
+        apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
+        apt-get install -y git/buster-backports
+
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.inputs.branch }}
+
+
+    - id: changed-files
+      if: github.event.inputs.manPages == 'true'
+      name: Get Changed Files
+      uses: dorny/paths-filter@v2
+      with:
+        token: ${{ github.token }}
+        list-files: json
+        filters: |
+          docs:
+            - doc/**
+
+    - name: Install Nox
+      if: github.event.inputs.manPages == 'true'
+      env:
+        PIP_EXTRA_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+      run: |
+        python -m pip install --upgrade pip
+        pip install nox
+
+    - name: Install Python Requirements
+      if: github.event.inputs.manPages == 'true'
+      env:
+        PIP_EXTRA_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+      run:
+        nox --install-only --forcecolor -e 'docs-man(compress=False, update=True, clean=True)'
+
+    - name: Build Manpages
+      if: github.event.inputs.manPages == 'true'
+      env:
+        SKIP_REQUIREMENTS_INSTALL: YES
+      run: |
+        nox --forcecolor -e 'docs-man(compress=False, update=True, clean=True)'
+
+    - name: Store Generated Documentation
+      if: github.event.inputs.manPages == 'true'
+      uses: actions/upload-artifact@v2
+      with:
+        name: salt-man-pages
+        path: doc/_build/man
+
+  PullRequest:
+    needs: [SaltChangelog, Manpages]
+    name: Create Pull Request
+    runs-on: ubuntu-latest
+
+    container:
+      image: python:3.8.6-slim-buster
+
+    steps:
+    - name: Install System Deps
+      run: |
+        echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
+        apt-get update
+        apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
+        apt-get install -y git/buster-backports
+
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.inputs.branch }}
+        fetch-depth: 0
+
+    - name: Download salt-man-pages
+      if: github.event.inputs.manPages == 'true'
+      uses: actions/download-artifact@v2
+      with:
+        name: salt-man-pages
+        path: doc/man/
+
+    - name: Download salt changelog
+      uses: actions/download-artifact@v2
+      with:
+        name: salt-changelog
+
+    - name: Generate Release Notes and changelog
+      run: |
+       git apply rm_changelog_patch.txt
+       rm rm_changelog_patch.txt
+       sed -i '0,/^======/d' rn_changelog
+       cat rn_changelog
+       cat rn_changelog >> doc/topics/releases/${{ github.event.inputs.saltVersion }}.rst
+       rm rn_changelog
+
+    - name: Create Pull Request for Release
+      uses: peter-evans/create-pull-request@v3
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: Add changelog and docs for ${{ github.event.inputs.saltVersion }} release
+        title: 'Generate Salt Man Page and Changelog'
+        body: >
+          This PR is auto-generated by
+          [create-pull-request](https://github.com/peter-evans/create-pull-request).
+        branch: docs_${{ github.event.inputs.saltVersion }}
+        base: ${{ github.event.inputs.branch }}

.github/workflows/scripts/pr-docstring-comments.py

@@ -58,20 +58,15 @@
 """
 
 
-def delete_previous_comments(pr, created_comment_id):
+def get_previous_comments(pr):
     for comment in pr.get_issue_comments():
         if comment.user.login != "github-actions[bot]":
             # Not a comment made by this bot
             continue
-        if comment.id == created_comment_id:
-            # This is the comment we have just created
-            continue
         if not comment.body.startswith(COMMENT_HEADER):
             # This comment does not start with our header
             continue
-        # We have a match, delete it
-        print(f"Deleting previous comment {comment}")
-        comment.delete()
+        yield comment
 
 
 def comment_on_pr(options, issues_output):
@@ -87,8 +82,17 @@ def comment_on_pr(options, issues_output):
             comment_header=COMMENT_HEADER, issues_output=issues_output
         )
     )
+    new_comment_content = COMMENT_TEMPLATE.format(
+        comment_header=COMMENT_HEADER, issues_output=issues_output
+    )
+    for comment in get_previous_comments(pr):
+        if comment.body.strip() != new_comment_content.strip():
+            # The content has changed.
+            print(f"Deleting previous comment {comment}")
+            comment.delete()
+
+    comment = pr.create_issue_comment(new_comment_content)
     print(f"Created Comment: {comment}")
-    delete_previous_comments(pr, comment.id)
 
 
 def main():