Hotfix openstack wait for fun utils v3006.1

.backportrc.json

@@ -0,0 +1,15 @@
+{
+  "repoOwner": "saltstack",
+  "repoName": "salt",
+  "targetBranchChoices": ["master", "3006.x", "3005.x"],
+  "autoMerge": false,
+  "autoMergeMethod": "rebase",
+  "branchLabelMapping": {
+    "^backport:(.+)$": "$1"
+  },
+  "prTitle": "[BACKPORT] {commitMessages}",
+  "publishStatusCommentOnSuccess": true,
+  "sourcePRLabels": [
+    "backport:complete"
+  ]
+}

.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
@@ -107,6 +107,29 @@ flags:
     paths:
       - tests/
     carryforward: true
+  unit:
+    paths:
+      - tests/unit
+      - tests/pytests/unit
+    carryforward: true
+  functional:
+    paths:
+      - tests/pytests/functional
+    carryforward: true
+  scenarios:
+    paths:
+      - tests/pytests/scenarios
+    carryforward: true
+  integration:
+    paths:
+      - tests/integration
+      - tests/pytests/integration
+    carryforward: true
+  system:
+    paths:
+      - tests/integration
+      - tests/pytests/integration
+    carryforward: true
 
 #comment:
 #  layout: "reach, diff, flags, files"

.coveragerc

@@ -32,16 +32,13 @@ ignore_errors = True
 [paths]
 salt =
   salt/
-  /tmp/kitchen/testing/salt/
-  /private/tmp/kitchen/testing/salt/
-  C:\Users\admini~1\AppData\Local\Temp\kitchen\testing\salt\
-  C:\Users\Administrator\AppData\Local\Temp\kitchen\testing\salt\
+  artifacts/salt
+  **/testing/salt/
+  **\testing\salt
 tests =
   tests/
-  /tmp/kitchen/testing/tests/
-  /private/tmp/kitchen/testing/tests/
-  C:\Users\admini~1\AppData\Local\Temp\kitchen\testing\tests\
-  C:\Users\Administrator\AppData\Local\Temp\kitchen\testing\tests\
+  **/testing/tests/
+  **\testing\tests
 extension_modules =
   tests/integration/files/extension_modules/
   */extension_modules/

.github/CODEOWNERS

@@ -12,55 +12,52 @@
 *                                   @saltstack/team-core
 
 # Team Boto
-salt/*/*boto*                       @saltstack/team-boto @saltstack/team-core
+salt/*/*boto*                       @saltstack/team-core
 
 # Team Cloud
-salt/cloud/*                        @saltstack/team-cloud @saltstack/team-core
-salt/utils/openstack/*              @saltstack/team-cloud @saltstack/team-core
-salt/utils/aws.py                   @saltstack/team-cloud @saltstack/team-core
-salt/*/*cloud*                      @saltstack/team-cloud @saltstack/team-core
+salt/cloud/*                        @saltstack/team-core
+salt/utils/openstack/*              @saltstack/team-core
+salt/utils/aws.py                   @saltstack/team-core
+salt/*/*cloud*                      @saltstack/team-core
 
 # Team NetAPI
-salt/cli/api.py                     @saltstack/team-netapi @saltstack/team-core
-salt/client/netapi.py               @saltstack/team-netapi @saltstack/team-core
-salt/netapi/*                       @saltstack/team-netapi @saltstack/team-core
+salt/cli/api.py                     @saltstack/team-core
+salt/client/netapi.py               @saltstack/team-core
+salt/netapi/*                       @saltstack/team-core
 
 # Team Network
-salt/proxy/*                        @saltstack/team-proxy @saltstack/team-core
+salt/proxy/*                        @saltstack/team-core
 
 # Team SPM
-salt/cli/spm.py                     @saltstack/team-spm @saltstack/team-core
-salt/spm/*                          @saltstack/team-spm @saltstack/team-core
+salt/cli/spm.py                     @saltstack/team-core
+salt/spm/*                          @saltstack/team-core
 
 # Team SSH
-salt/cli/ssh.py                     @saltstack/team-ssh @saltstack/team-core
-salt/client/ssh/*                   @saltstack/team-ssh @saltstack/team-core
-salt/roster/*                       @saltstack/team-ssh @saltstack/team-core
-salt/runners/ssh.py                 @saltstack/team-ssh @saltstack/team-core
-salt/*/thin.py                      @saltstack/team-ssh @saltstack/team-core
+salt/cli/ssh.py                     @saltstack/team-core
+salt/client/ssh/*                   @saltstack/team-core
+salt/roster/*                       @saltstack/team-core
+salt/runners/ssh.py                 @saltstack/team-core
+salt/*/thin.py                      @saltstack/team-core
 
 # Team State
-salt/state.py                       @saltstack/team-state @saltstack/team-core
+salt/state.py                       @saltstack/team-core
 
 # Team SUSE
-salt/*/*btrfs*                      @saltstack/team-suse @saltstack/team-core
-salt/*/*kubernetes*                 @saltstack/team-suse @saltstack/team-core
-salt/*/*pkg*                        @saltstack/team-suse @saltstack/team-core
-salt/*/*snapper*                    @saltstack/team-suse @saltstack/team-core
-salt/*/*xfs*                        @saltstack/team-suse @saltstack/team-core
-salt/*/*zypper*                     @saltstack/team-suse @saltstack/team-core
+salt/*/*btrfs*                      @saltstack/team-core
+salt/*/*kubernetes*                 @saltstack/team-core
+salt/*/*pkg*                        @saltstack/team-core
+salt/*/*snapper*                    @saltstack/team-core
+salt/*/*xfs*                        @saltstack/team-core
+salt/*/*zypper*                     @saltstack/team-core
 
 # Team Transport
-salt/transport/*                    @saltstack/team-transport @saltstack/team-core
-salt/utils/zeromq.py                @saltstack/team-transport @saltstack/team-core
+salt/transport/*                    @saltstack/team-core
+salt/utils/zeromq.py                @saltstack/team-core
 
 # Team Windows
-salt/*/*win*                        @saltstack/team-windows @saltstack/team-core
-salt/modules/reg.py                 @saltstack/team-windows @saltstack/team-core
-salt/states/reg.py                  @saltstack/team-windows @saltstack/team-core
-tests/*/*win*                       @saltstack/team-windows @saltstack/team-core
-tests/*/test_reg.py                 @saltstack/team-windows @saltstack/team-core
-tests/pytests/*                     @saltstack/team-code @s0undt3ch
-
-# Jenkins Integration
-.ci/*                               @saltstack/saltstack-sre-team @saltstack/team-core
+salt/*/*win*                        @saltstack/team-core
+salt/modules/reg.py                 @saltstack/team-core
+salt/states/reg.py                  @saltstack/team-core
+tests/*/*win*                       @saltstack/team-core
+tests/*/test_reg.py                 @saltstack/team-core
+tests/pytests/*                     @saltstack/team-core @s0undt3ch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,8 +21,11 @@ Please be as specific as possible and give set-up details.
 - [ ] container (Kubernetes, Docker, containerd, etc. please specify)
 - [ ] or a combination, please be explicit
 - [ ] jails if it is FreeBSD
+- [ ] classic packaging
+- [ ] onedir packaging
+- [ ] used bootstrap to install
+
 
-
 **Steps to Reproduce the behavior**
 (Include debug logs if possible and relevant)
 
@@ -34,7 +37,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Versions Report**
 <details><summary>salt --versions-report</summary>
-(Provided by running salt --versions-report. Please also mention any differences in master/minion versions.) 
+(Provided by running salt --versions-report. Please also mention any differences in master/minion versions.)
 
 ```yaml
 PASTE HERE

.github/ISSUE_TEMPLATE/config.yml

@@ -9,6 +9,3 @@ contact_links:
   - name: Salt on LiberaChat
     url: https://web.libera.chat/#salt
     about: Please ask and answer questions here.
-  - name: Security vulnerabilities
-    email: [email protected]
-    about: Please report security vulnerabilities here.

.github/actionlint.yaml

@@ -0,0 +1,13 @@
+self-hosted-runner:
+  # Labels of self-hosted runner in array of string
+  labels:
+    - bastion
+    - x86_64
+    - arm64
+    - aarch64
+    - amd64
+    - repo-nightly
+    - repo-staging
+    - repo-release
+    - medium
+    - large

.github/actions/build-onedir-deps/action.yml

@@ -0,0 +1,63 @@
+---
+name: build-onedir-deps
+description: Build Onedir Dependencies
+inputs:
+  platform:
+    required: true
+    type: string
+    description: The platform to build
+  arch:
+    required: true
+    type: string
+    description: The platform arch to build
+  python-version:
+    required: true
+    type: string
+    description: The python version to build
+  package-name:
+    required: false
+    type: string
+    description: The onedir package name to create
+    default: salt
+  cache-prefix:
+    required: true
+    type: string
+    description: Seed used to invalidate caches
+
+
+env:
+  COLUMNS: 190
+  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  RELENV_BUILDENV: 1
+
+
+runs:
+  using: composite
+
+  steps:
+
+    - name: Cache Deps Onedir Package Directory
+      id: onedir-pkg-cache
+      uses: actions/cache@v3
+      with:
+        path: artifacts/${{ inputs.package-name }}
+        key: >
+          ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|
+          ${{ hashFiles(
+            format('{0}/.relenv/**/*.xz', github.workspace),
+            'requirements/static/pkg/*/*.txt',
+            '.github/actions/build-onedir-deps/action.yml',
+            'cicd/shared-gh-workflows-context.yml'
+          ) }}
+
+    - name: Install Salt Onedir Package Dependencies
+      shell: bash
+      if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
+      run: |
+        tools pkg build onedir-dependencies --arch ${{ inputs.arch }} --python-version ${{ inputs.python-version }} --package-name artifacts/${{ inputs.package-name }} --platform ${{ inputs.platform }}
+
+    - name: Cleanup Salt Onedir Directory
+      shell: bash
+      run: |
+        tools pkg pre-archive-cleanup artifacts/${{ inputs.package-name }}

.github/actions/build-onedir-salt/action.yml

@@ -0,0 +1,106 @@
+---
+name: build-onedir-salt
+description: Build Onedir Package
+inputs:
+  platform:
+    required: true
+    type: string
+    description: The platform to build
+  arch:
+    required: true
+    type: string
+    description: The platform arch to build
+  package-name:
+    required: false
+    type: string
+    description: The onedir package name to create
+    default: salt
+  cache-prefix:
+    required: true
+    type: string
+    description: Seed used to invalidate caches
+  python-version:
+    required: true
+    type: string
+    description: The python version to build
+  salt-version:
+    type: string
+    required: true
+    description: The Salt version to set prior to building packages.
+
+
+env:
+  COLUMNS: 190
+  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  RELENV_BUILDENV: 1
+
+
+runs:
+  using: composite
+
+  steps:
+
+    - name: Download Cached Deps Onedir Package Directory
+      id: onedir-bare-cache
+      uses: actions/cache@v3
+      with:
+        path: artifacts/${{ inputs.package-name }}
+        key: >
+          ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|
+          ${{ hashFiles(
+            format('{0}/.relenv/**/*.xz', github.workspace),
+            'requirements/static/pkg/*/*.txt',
+            '.github/actions/build-onedir-deps/action.yml',
+            'cicd/shared-gh-workflows-context.yml'
+          ) }}
+
+    - name: Download Source Tarball
+      uses: actions/download-artifact@v3
+      with:
+        name: salt-${{ inputs.salt-version }}.tar.gz
+
+    - name: Install Salt Into Onedir
+      shell: bash
+      run: |
+        tools pkg build salt-onedir salt-${{ inputs.salt-version }}.tar.gz --platform ${{ inputs.platform }} --package-name artifacts/${{ inputs.package-name }}
+
+    - name: Cleanup Salt Onedir Directory
+      shell: bash
+      run: |
+        tools pkg pre-archive-cleanup artifacts/${{ inputs.package-name }}
+
+    - name: Create Archive
+      shell: bash
+      run: |
+        cd artifacts/
+        tar -cJf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz  ${{ inputs.package-name }}
+
+    - name: Create Archive (Zipfile)
+      if: ${{ inputs.platform == 'windows' }}
+      shell: powershell
+      run: |
+        cd artifacts
+        py -3 -m zipfile -c "${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.zip" ${{ inputs.package-name }}
+
+    - name: Create Hash Files
+      shell: bash
+      run: |
+        tools pkg generate-hashes artifacts/${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.*
+
+    - name: Upload Onedir Tarball as an Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
+        path: artifacts/${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz*
+        retention-days: 7
+        if-no-files-found: error
+
+    - name: Upload Onedir Zipfile as an Artifact
+      if: ${{ inputs.platform == 'windows' }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.zip
+        path: artifacts/${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.zip*
+        retention-days: 7
+        if-no-files-found: error