saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[3006.x] rebase test labels (#64053)

Browse source 
* changelog

* add actions

* add tools

* typo

* add some debug

* pulls vs push

* fire on pullr only

* test port part 1

* part 2

* part 3

* part 4

* fix double run slow

* clean up

* update types

* reg workflow

* reg workflow
This commit is contained in:
Charles McMarrow 2023-04-15 20:19:58 -05:00 • committed by GitHub
parent 117cd55887
commit 8dc6dd61d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
125 changed files with 864 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.github/actions/get-pull-labels/action.yml vendored Normal file
View file

@ -0,0 +1,23 @@
---
name: get-pull-labels
description: Get Pull Labels
inputs:
pull-request:
type: string
outputs:
labels:
value: ${{ steps.get-pull-labels.outputs.labels }}
runs:
using: composite
steps:
- name: Get Pull Labels
id: get-pull-labels
shell: bash
env:
PULL_REQUEST: ${{ inputs.pull-request }}
run: |
labels=$(jq -c '[.labels[].name]' <<< $PULL_REQUEST)
echo $labels
echo "labels=$labels" >> "$GITHUB_OUTPUT"

46
.github/actions/get-pull-number/action.yml vendored Normal file
View file

@ -0,0 +1,46 @@
---
name: get-pull-number
description: Get Pull Number
inputs:
owner:
type: string
repo:
type: string
sha:
type: string
pull-number:
default: null
outputs:
number:
value: ${{ steps.get-pull-number.outputs.number }}
runs:
using: composite
steps:
- name: Get Pull Number
id: get-pull-number
shell: bash
env:
GITHUB_OWNER: ${{ inputs.owner }}
GITHUB_REPO: ${{ inputs.repo }}
GITHUB_SHA: ${{ inputs.sha }}
GITHUB_PULL_NUMBER: ${{ inputs.pull-number }}
run: |
if [ -z "$GITHUB_PULL_NUMBER" ]
then
echo "Searching For Pull Number"
echo $GITHUB_OWNER
echo $GITHUB_REPO
echo $GITHUB_SHA
pulls=$(gh api repos/$GITHUB_OWNER/$GITHUB_REPO/commits/$GITHUB_SHA/pulls)
echo $pulls
full_name=$GITHUB_OWNER/$GITHUB_REPO
number=$(jq -c --arg r "$full_name" '[.[] | select(.url | contains($r))][0].number' <<< $pulls )
else
echo "Given Pull Number"
number=$GITHUB_PULL_NUMBER
fi
echo $number
echo "number=$number" >> "$GITHUB_OUTPUT"

30
.github/actions/get-pull-request/action.yml vendored Normal file
View file

@ -0,0 +1,30 @@
---
name: get-pull-request
description: Get Pull Request
inputs:
owner:
type: string
repo:
type: string
pull-number:
type: number
outputs:
pull-request:
value: ${{ steps.get-pull-request.outputs.request }}
runs:
using: composite
steps:
- name: Get Pull Request
id: get-pull-request
shell: bash
env:
GITHUB_OWNER: ${{ inputs.owner }}
GITHUB_REPO: ${{ inputs.repo }}
GITHUB_PULL_NUMBER: ${{ inputs.pull-number }}
run: |
pull=$(gh api repos/$GITHUB_OWNER/$GITHUB_REPO/pulls/$GITHUB_PULL_NUMBER)
echo $pull
echo "request=$pull" >> "$GITHUB_OUTPUT"

55
.github/workflows/ci.yml vendored
View file

@ -33,6 +33,7 @@ jobs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
runners: ${{ steps.runner-types.outputs.runners }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
pull-labels: ${{ steps.get-pull-labels.outputs.labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -136,6 +137,36 @@ jobs:
salt-version: ""
validate-version: true
- name: Get Pull Number
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-number
uses: ./.github/actions/get-pull-number
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
sha: ${{ github.sha }}
pull-number: ${{ github.event.pull_request.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Request
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-request
uses: ./.github/actions/get-pull-request
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
pull-number: ${{ steps.get-pull-number.outputs.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Labels
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-labels
uses: ./.github/actions/get-pull-labels
with:
pull-request: ${{ steps.get-pull-request.outputs.pull-request }}
- name: Write Changed Files To A Local File
run:
echo '${{ toJSON(steps.changed-files.outputs) }}' > changed-files.json
@ -821,6 +852,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -839,6 +871,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -857,6 +890,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -875,6 +909,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -893,6 +928,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -911,6 +947,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -929,6 +966,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -947,6 +985,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -965,6 +1004,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -983,6 +1023,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1001,6 +1042,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1019,6 +1061,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1037,6 +1080,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1055,6 +1099,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1073,6 +1118,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1091,6 +1137,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1109,6 +1156,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1127,6 +1175,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1145,6 +1194,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1163,6 +1213,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1181,6 +1232,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1199,6 +1251,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1217,6 +1270,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
@ -1235,6 +1289,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: ${{ github.event_name == 'pull_request' }}
skip-junit-reports: ${{ github.event_name == 'pull_request' }}

55
.github/workflows/nightly.yml vendored
View file

@ -77,6 +77,7 @@ jobs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
runners: ${{ steps.runner-types.outputs.runners }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
pull-labels: ${{ steps.get-pull-labels.outputs.labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -180,6 +181,36 @@ jobs:
salt-version: ""
validate-version: true
- name: Get Pull Number
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-number
uses: ./.github/actions/get-pull-number
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
sha: ${{ github.sha }}
pull-number: ${{ github.event.pull_request.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Request
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-request
uses: ./.github/actions/get-pull-request
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
pull-number: ${{ steps.get-pull-number.outputs.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Labels
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-labels
uses: ./.github/actions/get-pull-labels
with:
pull-request: ${{ steps.get-pull-request.outputs.pull-request }}
- name: Write Changed Files To A Local File
run:
echo '${{ toJSON(steps.changed-files.outputs) }}' > changed-files.json
@ -874,6 +905,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -892,6 +924,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -910,6 +943,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -928,6 +962,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -946,6 +981,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -964,6 +1000,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -982,6 +1019,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1000,6 +1038,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1018,6 +1057,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1036,6 +1076,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1054,6 +1095,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1072,6 +1114,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1090,6 +1133,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1108,6 +1152,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1126,6 +1171,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1144,6 +1190,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1162,6 +1209,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1180,6 +1228,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1198,6 +1247,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1216,6 +1266,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1234,6 +1285,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1252,6 +1304,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1270,6 +1323,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1288,6 +1342,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false

55
.github/workflows/scheduled.yml vendored
View file

@ -76,6 +76,7 @@ jobs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
runners: ${{ steps.runner-types.outputs.runners }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
pull-labels: ${{ steps.get-pull-labels.outputs.labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -179,6 +180,36 @@ jobs:
salt-version: ""
validate-version: true
- name: Get Pull Number
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-number
uses: ./.github/actions/get-pull-number
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
sha: ${{ github.sha }}
pull-number: ${{ github.event.pull_request.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Request
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-request
uses: ./.github/actions/get-pull-request
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
pull-number: ${{ steps.get-pull-number.outputs.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Labels
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-labels
uses: ./.github/actions/get-pull-labels
with:
pull-request: ${{ steps.get-pull-request.outputs.pull-request }}
- name: Write Changed Files To A Local File
run:
echo '${{ toJSON(steps.changed-files.outputs) }}' > changed-files.json
@ -864,6 +895,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -882,6 +914,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -900,6 +933,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -918,6 +952,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -936,6 +971,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -954,6 +990,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -972,6 +1009,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -990,6 +1028,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1008,6 +1047,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1026,6 +1066,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1044,6 +1085,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1062,6 +1104,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1080,6 +1123,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1098,6 +1142,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1116,6 +1161,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1134,6 +1180,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1152,6 +1199,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1170,6 +1218,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1188,6 +1237,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1206,6 +1256,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1224,6 +1275,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1242,6 +1294,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1260,6 +1313,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false
@ -1278,6 +1332,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: false
skip-junit-reports: false

55
.github/workflows/staging.yml vendored
View file

@ -69,6 +69,7 @@ jobs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
runners: ${{ steps.runner-types.outputs.runners }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
pull-labels: ${{ steps.get-pull-labels.outputs.labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -172,6 +173,36 @@ jobs:
salt-version: "${{ inputs.salt-version }}"
validate-version: true
- name: Get Pull Number
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-number
uses: ./.github/actions/get-pull-number
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
sha: ${{ github.sha }}
pull-number: ${{ github.event.pull_request.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Request
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-request
uses: ./.github/actions/get-pull-request
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
pull-number: ${{ steps.get-pull-number.outputs.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Labels
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-labels
uses: ./.github/actions/get-pull-labels
with:
pull-request: ${{ steps.get-pull-request.outputs.pull-request }}
- name: Check Existing Releases
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -871,6 +902,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -889,6 +921,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -907,6 +940,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -925,6 +959,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -943,6 +978,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -961,6 +997,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -979,6 +1016,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -997,6 +1035,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1015,6 +1054,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1033,6 +1073,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1051,6 +1092,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1069,6 +1111,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1087,6 +1130,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1105,6 +1149,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1123,6 +1168,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1141,6 +1187,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1159,6 +1206,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1177,6 +1225,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1195,6 +1244,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1213,6 +1263,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1231,6 +1282,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1249,6 +1301,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1267,6 +1320,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true
@ -1285,6 +1339,7 @@ jobs:
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: true
skip-junit-reports: true

39
.github/workflows/templates/layout.yml.jinja vendored
View file

@ -19,7 +19,13 @@ run-name: "<{ workflow_name }> (${{ github.event_name == 'pull_request' && forma
on:
push: {}
pull_request: {}
pull_request:
types:
- labeled
- unlabeled
- opened
- reopened
- synchronize
<%- endblock on %>
@ -79,6 +85,7 @@ jobs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
runners: ${{ steps.runner-types.outputs.runners }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
pull-labels: ${{ steps.get-pull-labels.outputs.labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -182,6 +189,36 @@ jobs:
salt-version: "<{ prepare_workflow_salt_version_input }>"
validate-version: true
- name: Get Pull Number
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-number
uses: ./.github/actions/get-pull-number
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
sha: ${{ github.sha }}
pull-number: ${{ github.event.pull_request.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Request
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-request
uses: ./.github/actions/get-pull-request
with:
owner: ${{ github.repository_owner }}
repo: ${{ github.event.repository.name }}
pull-number: ${{ steps.get-pull-number.outputs.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Get Pull Labels
if: ${{ github.event_name == 'pull_request' }}
id: get-pull-labels
uses: ./.github/actions/get-pull-labels
with:
pull-request: ${{ steps.get-pull-request.outputs.pull-request }}
<%- if prepare_actual_release %>
- name: Check Existing Releases

3
.github/workflows/templates/test-salt.yml.jinja vendored
View file

@ -19,6 +19,7 @@
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version_windows }>
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: <{ skip_test_coverage_check }>
skip-junit-reports: <{ skip_junit_reports_check }>
@ -42,6 +43,7 @@
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version_macos }>
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: <{ skip_test_coverage_check }>
skip-junit-reports: <{ skip_junit_reports_check }>
@ -84,6 +86,7 @@
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version_linux }>
pull-labels: ${{ needs.prepare-workflow.outputs.pull-labels }}
skip-code-coverage: <{ skip_test_coverage_check }>
skip-junit-reports: <{ skip_junit_reports_check }>

129
.github/workflows/test-action-macos.yml vendored
View file

@ -42,6 +42,11 @@ on:
type: string
description: The onedir package name to use
default: salt
pull-labels:
required: false
type: string
description: List of all the pull labels
default: '["test:slow", "test:core"]'
skip-code-coverage:
required: false
type: boolean
@ -262,9 +267,36 @@ jobs:
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- -k "mac or darwin"
- name: Run Slow/Changed Tests
id: run-slow-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
- name: Get Test Flags
id: get-test-flags
shell: bash
env:
PULL_LABELS: ${{ inputs.pull-labels }}
run: |
echo "$PULL_LABELS"
# shellcheck disable=SC2086
no_fast_tests="$(jq -c '. | any(index("test:no-fast"))' <<< $PULL_LABELS)"
# shellcheck disable=SC2086
slow_tests="$(jq -c '. | any(index("test:slow"))' <<< $PULL_LABELS)"
# shellcheck disable=SC2086
core_tests="$(jq -c '. | any(index("test:core"))' <<< $PULL_LABELS)"
# shellcheck disable=SC2086
flaky_jail_tests="$(jq -c '. | any(index("test:flaky-jail"))' <<< $PULL_LABELS)"
echo "$no_fast_tests"
echo "$slow_tests"
echo "$core_tests"
echo "$flaky_jail_tests"
# shellcheck disable=SC2086
{
echo "no_fast_tests=$no_fast_tests";
echo "slow_tests=$slow_tests";
echo "core_tests=$core_tests";
echo "flaky_jail_tests=$flaky_jail_tests";
} >> "$GITHUB_OUTPUT"
- name: Run Fast/Changed Tests
id: run-fast-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.no_fast_tests == 'true' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
@ -276,11 +308,46 @@ jobs:
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --run-slow --from-filenames=testrun-changed-files.txt
-k "mac or darwin" --suppress-no-test-exit-code \
--from-filenames=testrun-changed-files.txt
- name: Run Slow/Changed Tests
id: run-slow-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.slow_tests == 'false' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
PRINT_TEST_PLAN_ONLY: "0"
PRINT_SYSTEM_INFO: "0"
RERUN_FAILURES: "1"
GITHUB_ACTIONS_PIPELINE: "1"
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests \
--from-filenames=testrun-changed-files.txt
- name: Run Core/Changed Tests
id: run-core-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.core_tests == 'false' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
PRINT_TEST_PLAN_ONLY: "0"
PRINT_SYSTEM_INFO: "0"
RERUN_FAILURES: "1"
GITHUB_ACTIONS_PIPELINE: "1"
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests \
--from-filenames=testrun-changed-files.txt
- name: Run Fast Tests
id: run-fast-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.no_fast_tests == 'false' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
@ -292,7 +359,55 @@ jobs:
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin"
-k "mac or darwin" --suppress-no-test-exit-code
- name: Run Slow Tests
id: run-slow-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.slow_tests == 'true' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
PRINT_TEST_PLAN_ONLY: "0"
PRINT_SYSTEM_INFO: "0"
RERUN_FAILURES: "1"
GITHUB_ACTIONS_PIPELINE: "1"
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests
- name: Run Core Tests
id: run-core-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.core_tests == 'true' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
PRINT_TEST_PLAN_ONLY: "0"
PRINT_SYSTEM_INFO: "0"
RERUN_FAILURES: "1"
GITHUB_ACTIONS_PIPELINE: "1"
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests
- name: Run Flaky Tests
id: run-flaky-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.flaky_jail_tests == 'false' }}
env:
SKIP_REQUIREMENTS_INSTALL: "1"
PRINT_TEST_SELECTION: "0"
PRINT_TEST_PLAN_ONLY: "0"
PRINT_SYSTEM_INFO: "0"
RERUN_FAILURES: "1"
GITHUB_ACTIONS_PIPELINE: "1"
SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
-k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --flaky-jail
- name: Run Full Tests
id: run-full-tests
@ -308,7 +423,7 @@ jobs:
SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
run: |
sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
--run-slow -k "mac or darwin"
--slow-tests --core-tests -k "mac or darwin"
- name: Fix file ownership
run: |

90
.github/workflows/test-action.yml vendored
View file

@ -37,6 +37,11 @@ on:
type: string
description: The onedir package name to use
default: salt
pull-labels:
required: false
type: string
description: List of all the pull labels
default: '["test:slow", "test:core"]'
skip-code-coverage:
required: false
type: boolean
@ -296,30 +301,99 @@ jobs:
--nox-session=${{ env.NOX_SESSION }} ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }}
- name: Run Slow/Changed Tests
id: run-slow-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
- name: Get Test Flags
id: get-test-flags
shell: bash
env:
PULL_LABELS: ${{ inputs.pull-labels }}
run: |
echo "$PULL_LABELS"
# shellcheck disable=SC2086
no_fast_tests="$(jq -c '. | any(index("test:no-fast"))' <<< $PULL_LABELS)"
# shellcheck disable=SC2086
slow_tests="$(jq -c '. | any(index("test:slow"))' <<< $PULL_LABELS)"
# shellcheck disable=SC2086
core_tests="$(jq -c '. | any(index("test:core"))' <<< $PULL_LABELS)"
# shellcheck disable=SC2086
flaky_jail_tests="$(jq -c '. | any(index("test:flaky-jail"))' <<< $PULL_LABELS)"
echo "$no_fast_tests"
echo "$slow_tests"
echo "$core_tests"
echo "$flaky_jail_tests"
# shellcheck disable=SC2086
{
echo "no_fast_tests=$no_fast_tests";
echo "slow_tests=$slow_tests";
echo "core_tests=$core_tests";
echo "flaky_jail_tests=$flaky_jail_tests";
} >> "$GITHUB_OUTPUT"
- name: Run Fast/Changed Tests
id: run-fast-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.no_fast_tests == 'true' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- \
--run-slow --suppress-no-test-exit-code --from-filenames=testrun-changed-files.txt
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }} -- --suppress-no-test-exit-code \
--from-filenames=testrun-changed-files.txt
- name: Run Slow/Changed Tests
id: run-slow-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.slow_tests == 'false' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }} -- --no-fast-tests --slow-tests --suppress-no-test-exit-code \
--from-filenames=testrun-changed-files.txt
- name: Run Core/Changed Tests
id: run-core-changed-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.core_tests == 'false' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }} -- --no-fast-tests --core-tests --suppress-no-test-exit-code \
--from-filenames=testrun-changed-files.txt
- name: Run Fast Tests
id: run-fast-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.no_fast_tests == 'false' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
${{ inputs.distro-slug }} ${{ matrix.tests-chunk }}
- name: Run Slow Tests
id: run-slow-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.slow_tests == 'true' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }} -- --no-fast-tests --slow-tests
- name: Run Core Tests
id: run-core-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.core_tests == 'true' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }} -- --no-fast-tests --core-tests
- name: Run Flaky Tests
id: run-flaky-tests
if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && steps.get-test-flags.outputs.flaky_jail_tests == 'false' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
${{ matrix.tests-chunk }} -- --no-fast-tests --flaky-jail
- name: Run Full Tests
id: run-full-tests
if: ${{ fromJSON(inputs.testrun)['type'] == 'full' }}
run: |
tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
--nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --run-slow
${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests
- name: Combine Coverage Reports
if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled'

1
changelog/63081.added.md Normal file
View file

@ -0,0 +1 @@
Fix running fast tests twice and add git labels to suite.

86
tests/conftest.py
View file

@ -167,6 +167,46 @@ def pytest_addoption(parser):
"may be insecure! Default: False"
),
)
test_selection_group.addoption(
"--no-fast",
"--no-fast-tests",
dest="fast",
action="store_false",
default=True,
help="Don't run salt-fast tests. Default: %(default)s",
)
test_selection_group.addoption(
"--run-slow",
"--slow",
"--slow-tests",
dest="slow",
action="store_true",
default=False,
help="Run slow tests. Default: %(default)s",
)
test_selection_group.addoption(
"--core",
"--core-tests",
dest="core",
action="store_true",
default=False,
help=(
"Run salt-core tests. These tests test the engine of salt! "
"Default: %(default)s"
),
)
test_selection_group.addoption(
"--flaky",
"--flaky-jail",
dest="flaky",
action="store_true",
default=False,
help=(
"Run salt-flaky jail tests. These tests are in jail for being flaky! "
"One day they will be made not flaky."
"Default: %(default)s"
),
)
test_selection_group.addoption(
"--proxy",
"--proxy-tests",
@ -175,12 +215,6 @@ def pytest_addoption(parser):
default=False,
help="Run proxy tests (DEPRECATED)",
)
test_selection_group.addoption(
"--run-slow",
action="store_true",
default=False,
help="Run slow tests.",
)
output_options_group = parser.getgroup("Output Options")
output_options_group.addoption(
@ -269,6 +303,16 @@ def pytest_configure(config):
"slow_test: Mark test as being slow. These tests are skipped by default unless"
" `--run-slow` is passed",
)
config.addinivalue_line(
"markers",
"core_test: Mark test as being core. These tests are skipped by default unless"
" `--core-tests` is passed",
)
config.addinivalue_line(
"markers",
"flaky_jail: Mark test as being jlaky. These tests are skipped by default unless"
" `--flaky-jail` is passed",
)
config.addinivalue_line(
"markers",
"async_timeout: Timeout, in seconds, for asynchronous test functions(`async def`)",
@ -534,10 +578,34 @@ def pytest_runtest_setup(item):
item._skipped_by_mark = True
pytest.skip(PRE_PYTEST_SKIP_REASON)
if item.get_closest_marker("core_test"):
if not item.config.getoption("--core-tests"):
raise pytest.skip.Exception(
"Core tests are disabled, pass '--core-tests' to enable them.",
_use_item_location=True,
)
if item.get_closest_marker("slow_test"):
if item.config.getoption("--run-slow") is False:
item._skipped_by_mark = True
pytest.skip("Slow tests are disabled!")
if not item.config.getoption("--slow-tests"):
raise pytest.skip.Exception(
"Slow tests are disabled, pass '--run-slow' to enable them.",
_use_item_location=True,
)
if item.get_closest_marker("flaky_jail"):
if not item.config.getoption("--flaky-jail"):
raise pytest.skip.Exception(
"flaky jail tests are disabled, pass '--flaky-jail' to enable them.",
_use_item_location=True,
)
if (
not item.get_closest_marker("slow_test")
and not item.get_closest_marker("core_test")
and not item.get_closest_marker("flaky_jail")
):
if not item.config.getoption("--no-fast-tests"):
raise pytest.skip.Exception(
"Fast tests are disabled, dont pass '--no-fast-tests' to enable them.",
_use_item_location=True,
)
requires_sshd_server_marker = item.get_closest_marker("requires_sshd_server")
if requires_sshd_server_marker is not None:

1
tests/integration/modules/test_chocolatey.py
View file

@ -9,6 +9,7 @@ from tests.support.sminion import create_sminion
@pytest.mark.skip_unless_on_windows
@pytest.mark.windows_whitelisted
@pytest.mark.destructive_test
@pytest.mark.slow_test
class ChocolateyModuleTest(ModuleCase):
"""
Validate Chocolatey module

1
tests/integration/modules/test_linux_shadow.py
View file

@ -15,6 +15,7 @@ from tests.support.case import ModuleCase
@pytest.mark.skip_if_not_root
@pytest.mark.skip_unless_on_linux
@pytest.mark.slow_test
class ShadowModuleTest(ModuleCase):
"""
Validate the linux shadow system module

1
tests/integration/modules/test_mac_power.py
View file

@ -11,6 +11,7 @@ from tests.support.case import ModuleCase
@pytest.mark.skip_unless_on_darwin
@pytest.mark.skip_if_binaries_missing("systemsetup")
@pytest.mark.skip_if_not_root
@pytest.mark.slow_test
class MacPowerModuleTest(ModuleCase):
"""
Validate the mac_power module

1
tests/integration/modules/test_mac_system.py
View file

@ -21,6 +21,7 @@ SET_SUBNET_NAME = random_string("RS-", lowercase=False)
@pytest.mark.usefixtures("salt_sub_minion")
@pytest.mark.skip_if_not_root
@pytest.mark.skip_if_binaries_missing("systemsetup")
@pytest.mark.slow_test
class MacSystemModuleTest(ModuleCase):
"""
Validate the mac_system module

1
tests/integration/modules/test_mac_timezone.py
View file

@ -20,6 +20,7 @@ from tests.support.case import ModuleCase
@pytest.mark.skip_unless_on_darwin
@pytest.mark.skip_if_binaries_missing("systemsetup")
@pytest.mark.skip_if_not_root
@pytest.mark.slow_test
class MacTimezoneModuleTest(ModuleCase):
"""
Validate the mac_timezone module

1
tests/integration/modules/test_status.py
View file

@ -14,6 +14,7 @@ class StatusModuleTest(ModuleCase):
@pytest.mark.skip_on_windows
@pytest.mark.flaky(max_runs=4)
@pytest.mark.slow_test
def test_status_pid(self):
"""
status.pid

1
tests/integration/modules/test_win_ntp.py
View file

@ -6,6 +6,7 @@ from tests.support.case import ModuleCase
@pytest.mark.flaky(max_runs=4)
@pytest.mark.skip_unless_on_windows
@pytest.mark.windows_whitelisted
@pytest.mark.slow_test
class NTPTest(ModuleCase):
"""
Validate windows ntp module

1
tests/integration/ssh/test_state.py
View file

@ -17,6 +17,7 @@ SSH_SLS_FILE = "/tmp/salt_test_file"
log = logging.getLogger(__name__)
@pytest.mark.slow_test
class SSHStateTest(SSHCase):
"""
testing the state system with salt-ssh

1
tests/integration/states/test_lxd.py
View file

@ -13,6 +13,7 @@ from tests.support.mixins import SaltReturnAssertsMixin
@pytest.mark.skipif(salt.modules.lxd.HAS_PYLXD is False, reason="pylxd not installed")
@pytest.mark.skip_if_binaries_missing("lxd", reason="LXD not installed")
@pytest.mark.skip_if_binaries_missing("lxc", reason="LXC not installed")
@pytest.mark.slow_test
class LxdTestCase(ModuleCase, SaltReturnAssertsMixin):
@pytest.mark.flaky(max_runs=4)
def test_01__init_lxd(self):

1
tests/integration/states/test_lxd_container.py
View file

@ -13,6 +13,7 @@ from tests.support.mixins import SaltReturnAssertsMixin
@pytest.mark.skipif(salt.modules.lxd.HAS_PYLXD is False, reason="pylxd not installed")
@pytest.mark.skip_if_binaries_missing("lxd", reason="LXD not installed")
@pytest.mark.skip_if_binaries_missing("lxc", reason="LXC not installed")
@pytest.mark.slow_test
class LxdContainerTestCase(ModuleCase, SaltReturnAssertsMixin):
def setUp(self):
self.run_state(

1
tests/pytests/functional/cache/test_consul.py vendored
View file

@ -67,5 +67,6 @@ def cache(minion_opts, consul_container):
return cache
@pytest.mark.slow_test
def test_caching(subtests, cache):
run_common_cache_tests(subtests, cache)

1
tests/pytests/functional/modules/state/requisites/test_listen.py
View file

@ -2,6 +2,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_mixed.py
View file

@ -4,6 +4,7 @@ from . import normalize_ret
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_onchanges.py
View file

@ -4,6 +4,7 @@ from . import normalize_ret
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_onfail.py
View file

@ -4,6 +4,7 @@ from . import normalize_ret
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_onlyif.py
View file

@ -2,6 +2,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_prereq.py
View file

@ -4,6 +4,7 @@ from . import normalize_ret
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_require.py
View file

@ -6,6 +6,7 @@ from . import normalize_ret
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_unless.py
View file

@ -2,6 +2,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_use.py
View file

@ -2,6 +2,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/requisites/test_watch.py
View file

@ -6,6 +6,7 @@ from . import normalize_ret
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/test_jinja_renderer.py
View file

@ -2,6 +2,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/state/test_state.py
View file

@ -18,6 +18,7 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.core_test,
]

1
tests/pytests/functional/modules/test_ansiblegate.py
View file

@ -9,6 +9,7 @@ pytestmark = [
check_all=True,
reason="ansible is not installed",
),
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/test_aptpkg.py
View file

@ -17,6 +17,7 @@ from tests.support.mock import Mock, patch
pytestmark = [
pytest.mark.skip_if_binaries_missing("apt-cache", "grep"),
pytest.mark.slow_test,
]
KEY_FILES = (

1
tests/pytests/functional/modules/test_etcd_mod.py
View file

@ -14,6 +14,7 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/test_pip.py
View file

@ -21,6 +21,7 @@ from tests.support.helpers import VirtualEnv
),
)
@pytest.mark.requires_network
@pytest.mark.slow_test
def test_list_available_packages(modules, pip_version, tmp_path):
with VirtualEnv(venv_dir=tmp_path, pip_requirement=pip_version) as virtualenv:
virtualenv.install("-U", pip_version)

1
tests/pytests/functional/modules/test_saltutil.py
View file

@ -47,6 +47,7 @@ def get_top(configure_mocks):
yield get_top
@pytest.mark.slow_test
def test__get_top_file_envs(modules, get_top, destroy):
"""
Ensure we cleanup objects created by saltutil._get_top_file_envs #60449

5
tests/pytests/functional/modules/test_system.py
View file

@ -9,7 +9,10 @@ import pytest
import salt.utils.files
pytestmark = [pytest.mark.skip_unless_on_linux]
pytestmark = [
pytest.mark.skip_unless_on_linux,
pytest.mark.slow_test,
]
log = logging.getLogger(__name__)

1
tests/pytests/functional/modules/test_win_certutil.py
View file

@ -10,6 +10,7 @@ import salt.utils.files
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/test_win_dsc.py
View file

@ -10,6 +10,7 @@ import salt.exceptions
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/test_win_shortcut.py
View file

@ -21,6 +21,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.skipif(not HAS_WIN32, reason="Requires Win32 libraries"),
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/win_lgpo/test_audit_settings_module.py
View file

@ -6,6 +6,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/win_lgpo/test_get_policy.py
View file

@ -3,6 +3,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/win_lgpo/test_get_policy_info.py
View file

@ -10,6 +10,7 @@ from packaging import version
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/functional/modules/win_lgpo/test_registry_policy.py
View file

@ -6,6 +6,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/file/test__check_directory_win.py
View file

@ -6,6 +6,7 @@ import salt.utils.win_dacl as win_dacl
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/file/test_comment.py
View file

@ -10,6 +10,7 @@ from tests.support.helpers import dedent
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/file/test_directory_win.py
View file

@ -16,6 +16,7 @@ except NameError:
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/file/test_pruned.py
View file

@ -2,6 +2,7 @@ import pytest
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/file/test_rename.py
View file

@ -9,6 +9,7 @@ import salt.utils.path
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/pkgrepo/test_debian.py
View file

@ -21,6 +21,7 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.destructive_test,
pytest.mark.skip_if_not_root,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/test_archive.py
View file

@ -113,6 +113,7 @@ def web_root(tmp_path_factory):
shutil.rmtree(str(_web_root), ignore_errors=True)
@pytest.mark.slow_test
def test_archive_extracted_web_source_etag_operation(
modules, states, free_port, web_root, minion_opts
):

1
tests/pytests/functional/states/test_etcd_mod.py
View file

@ -13,6 +13,7 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/test_file.py
View file

@ -113,6 +113,7 @@ def web_root(tmp_path_factory):
shutil.rmtree(str(_web_root), ignore_errors=True)
@pytest.mark.slow_test
def test_file_managed_web_source_etag_operation(
states, free_port, web_root, minion_opts
):

10
tests/pytests/functional/states/test_module.py
View file

@ -7,7 +7,7 @@ from tests.support.helpers import dedent
log = logging.getLogger(__name__)
@pytest.mark.slow_test
@pytest.mark.core_test
def test_issue_58763(tmp_path, modules, state_tree, caplog):
venv_dir = tmp_path / "issue-2028-pip-installed"
@ -39,7 +39,7 @@ def test_issue_58763(tmp_path, modules, state_tree, caplog):
assert "Using new style module.run syntax: run_new" in caplog.messages
@pytest.mark.slow_test
@pytest.mark.core_test
def test_issue_58763_a(tmp_path, modules, state_tree, caplog):
venv_dir = tmp_path / "issue-2028-pip-installed"
@ -65,7 +65,7 @@ def test_issue_58763_a(tmp_path, modules, state_tree, caplog):
)
@pytest.mark.slow_test
@pytest.mark.core_test
def test_issue_58763_b(tmp_path, modules, state_tree, caplog):
venv_dir = tmp_path / "issue-2028-pip-installed"
@ -87,7 +87,7 @@ def test_issue_58763_b(tmp_path, modules, state_tree, caplog):
assert "Detected legacy module.run syntax: test.ping" in caplog.messages
@pytest.mark.slow_test
@pytest.mark.core_test
def test_issue_62988_a(tmp_path, modules, state_tree, caplog):
venv_dir = tmp_path / "issue-2028-pip-installed"
@ -117,7 +117,7 @@ def test_issue_62988_a(tmp_path, modules, state_tree, caplog):
assert "Using new style module.run syntax: run_new" in caplog.messages
@pytest.mark.slow_test
@pytest.mark.core_test
def test_issue_62988_b(tmp_path, modules, state_tree, caplog):
venv_dir = tmp_path / "issue-2028-pip-installed"

19
tests/pytests/functional/states/test_pkg.py
View file

@ -174,6 +174,7 @@ def latest_version(ctx, modules):
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_001_installed(modules, states, PKG_TARGETS):
"""
This is a destructive test as it installs and then removes a package
@ -194,6 +195,7 @@ def test_pkg_001_installed(modules, states, PKG_TARGETS):
@pytest.mark.usefixtures("VERSION_SPEC_SUPPORTED")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_002_installed_with_version(PKG_TARGETS, states, latest_version):
"""
This is a destructive test as it installs and then removes a package
@ -213,6 +215,7 @@ def test_pkg_002_installed_with_version(PKG_TARGETS, states, latest_version):
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_003_installed_multipkg(PKG_TARGETS, modules, states):
"""
This is a destructive test as it installs and then removes two packages
@ -236,6 +239,7 @@ def test_pkg_003_installed_multipkg(PKG_TARGETS, modules, states):
@pytest.mark.usefixtures("VERSION_SPEC_SUPPORTED")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_004_installed_multipkg_with_version(PKG_TARGETS, latest_version, states):
"""
This is a destructive test as it installs and then removes two packages
@ -259,6 +263,7 @@ def test_pkg_004_installed_multipkg_with_version(PKG_TARGETS, latest_version, st
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_005_installed_32bit(PKG_32_TARGETS, modules, states):
"""
This is a destructive test as it installs and then removes a package
@ -283,6 +288,7 @@ def test_pkg_005_installed_32bit(PKG_32_TARGETS, modules, states):
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_006_installed_32bit_with_version(PKG_32_TARGETS, latest_version, states):
"""
This is a destructive test as it installs and then removes a package
@ -307,6 +313,7 @@ def test_pkg_006_installed_32bit_with_version(PKG_32_TARGETS, latest_version, st
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_007_with_dot_in_pkgname(PKG_DOT_TARGETS, latest_version, states):
"""
This tests for the regression found in the following issue:
@ -329,6 +336,7 @@ def test_pkg_007_with_dot_in_pkgname(PKG_DOT_TARGETS, latest_version, states):
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_008_epoch_in_version(PKG_EPOCH_TARGETS, latest_version, states):
"""
This tests for the regression found in the following issue:
@ -455,6 +463,7 @@ def test_pkg_011_latest_only_upgrade(
@pytest.mark.usefixtures("WILDCARDS_SUPPORTED")
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_012_installed_with_wildcard_version(PKG_TARGETS, states, modules):
"""
This is a destructive test as it installs and then removes a package
@ -502,6 +511,7 @@ def test_pkg_012_installed_with_wildcard_version(PKG_TARGETS, states, modules):
@pytest.mark.requires_salt_modules("pkg.version", "pkg.latest_version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_013_installed_with_comparison_operator(
grains, PKG_TARGETS, states, modules
):
@ -540,6 +550,7 @@ def test_pkg_013_installed_with_comparison_operator(
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_014_installed_missing_release(grains, PKG_TARGETS, states, modules):
"""
Tests that a version number missing the release portion still resolves
@ -572,6 +583,7 @@ def test_pkg_014_installed_missing_release(grains, PKG_TARGETS, states, modules)
"pkg.hold", "pkg.unhold", "pkg.version", "pkg.list_pkgs"
)
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_015_installed_held(grains, modules, states, PKG_TARGETS):
"""
Tests that a package can be held even when the package is already installed.
@ -649,6 +661,7 @@ def test_pkg_015_installed_held(grains, modules, states, PKG_TARGETS):
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_016_conditionally_ignore_epoch(PKG_EPOCH_TARGETS, latest_version, states):
"""
See
@ -753,6 +766,7 @@ def test_pkg_017_installed_held_equals_false(grains, modules, states, PKG_TARGET
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_cap_001_installed(PKG_CAP_TARGETS, modules, states):
"""
This is a destructive test as it installs and then removes a package
@ -788,6 +802,7 @@ def test_pkg_cap_001_installed(PKG_CAP_TARGETS, modules, states):
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_cap_002_already_installed(PKG_CAP_TARGETS, modules, states):
"""
This is a destructive test as it installs and then removes a package
@ -829,6 +844,7 @@ def test_pkg_cap_002_already_installed(PKG_CAP_TARGETS, modules, states):
@pytest.mark.usefixtures("VERSION_SPEC_SUPPORTED")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_cap_003_installed_multipkg_with_version(
PKG_CAP_TARGETS,
PKG_TARGETS,
@ -891,6 +907,7 @@ def test_pkg_cap_003_installed_multipkg_with_version(
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.latest", "pkg.removed")
@pytest.mark.slow_test
def test_pkg_cap_004_latest(PKG_CAP_TARGETS, modules, states):
"""
This tests pkg.latest with a package that has no epoch (or a zero
@ -930,6 +947,7 @@ def test_pkg_cap_004_latest(PKG_CAP_TARGETS, modules, states):
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed", "pkg.downloaded")
@pytest.mark.slow_test
def test_pkg_cap_005_downloaded(PKG_CAP_TARGETS, modules, states):
"""
This is a destructive test as it installs and then removes a package
@ -963,6 +981,7 @@ def test_pkg_cap_005_downloaded(PKG_CAP_TARGETS, modules, states):
@pytest.mark.requires_salt_modules("pkg.version")
@pytest.mark.requires_salt_states("pkg.installed", "pkg.removed", "pkg.uptodate")
@pytest.mark.slow_test
def test_pkg_cap_006_uptodate(PKG_CAP_TARGETS, modules, states):
"""
This is a destructive test as it installs and then removes a package

1
tests/pytests/functional/states/test_user.py
View file

@ -76,6 +76,7 @@ def existing_account():
yield _account
@pytest.mark.slow_test
def test_user_absent(states):
"""
Test user.absent with a non existing account

1
tests/pytests/functional/states/test_zookeeper.py
View file

@ -15,6 +15,7 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.slow_test,
pytest.mark.skip_if_binaries_missing("dockerd"),
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/win_lgpo/test_admx_policy.py
View file

@ -15,6 +15,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/win_lgpo/test_adv_audit_settings_state.py
View file

@ -8,6 +8,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/win_lgpo/test_audit_settings_state.py
View file

@ -10,6 +10,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

1
tests/pytests/functional/states/win_lgpo/test_rights_assignment.py
View file

@ -9,6 +9,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

3
tests/pytests/functional/transport/server/test_req_channel.py
View file

@ -23,7 +23,8 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.skip_on_spawning_platform(
reason="These tests are currently broken on spawning platforms. Need to be rewritten.",
)
),
pytest.mark.slow_test,
]

1
tests/pytests/integration/cli/conftest.py
View file

@ -2,6 +2,7 @@ import pytest
@pytest.fixture(scope="package")
@pytest.mark.core_test
def salt_eauth_account(salt_eauth_account_factory):
with salt_eauth_account_factory as account:
yield account

2
tests/pytests/integration/cli/test_batch.py
View file

@ -8,7 +8,7 @@ import salt.utils.platform
pytestmark = [
pytest.mark.windows_whitelisted,
# pytest.mark.slow_test,
pytest.mark.core_test,
]

2
tests/pytests/integration/cli/test_matcher.py
View file

@ -5,7 +5,7 @@ import pytest
import salt.defaults.exitcodes
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

2
tests/pytests/integration/cli/test_salt.py
View file

@ -19,7 +19,7 @@ import salt.utils.path
log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

2
tests/pytests/integration/cli/test_salt_auth.py
View file

@ -5,7 +5,7 @@ import pytest
log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.skip_if_not_root,
pytest.mark.destructive_test,
pytest.mark.skip_on_windows,

2
tests/pytests/integration/cli/test_salt_call.py
View file

@ -15,7 +15,7 @@ import salt.utils.yaml
from tests.support.helpers import PRE_PYTEST_SKIP, PRE_PYTEST_SKIP_REASON
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

1
tests/pytests/integration/cli/test_salt_cp.py
View file

@ -34,6 +34,7 @@ def dest_testfile():
@pytest.mark.slow_test
@pytest.mark.windows_whitelisted
@pytest.mark.core_test
def test_cp_testfile(salt_minion, salt_cp_cli, source_testfile, dest_testfile):
"""
test salt-cp

3
tests/pytests/integration/cli/test_salt_deltaproxy.py
View file

@ -18,7 +18,8 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.skip_on_spawning_platform(
reason="Deltaproxy minions do not currently work on spawning platforms.",
)
),
pytest.mark.core_test,
]

2
tests/pytests/integration/cli/test_salt_key.py
View file

@ -12,7 +12,7 @@ import salt.utils.pycrypto
import salt.utils.yaml
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

2
tests/pytests/integration/cli/test_salt_master.py
View file

@ -8,7 +8,7 @@ import salt.defaults.exitcodes
from tests.support.helpers import PRE_PYTEST_SKIP_REASON
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

2
tests/pytests/integration/cli/test_salt_minion.py
View file

@ -9,7 +9,7 @@ import salt.defaults.exitcodes
from tests.support.helpers import PRE_PYTEST_SKIP_REASON
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

5
tests/pytests/integration/cli/test_salt_proxy.py
View file

@ -25,7 +25,7 @@ def proxy_minion_id(salt_master):
pytest.helpers.remove_stale_minion_key(salt_master, _proxy_minion_id)
@pytest.mark.slow_test
@pytest.mark.core_test
def test_exit_status_no_proxyid(salt_master, proxy_minion_id):
"""
Ensure correct exit status when --proxyid argument is missing.
@ -42,6 +42,7 @@ def test_exit_status_no_proxyid(salt_master, proxy_minion_id):
@pytest.mark.skip_on_windows(reason="Windows does not do user checks")
@pytest.mark.core_test
def test_exit_status_unknown_user(salt_master, proxy_minion_id):
"""
Ensure correct exit status when the proxy is configured to run as an
@ -57,7 +58,7 @@ def test_exit_status_unknown_user(salt_master, proxy_minion_id):
assert "The user is not available." in exc.value.process_result.stderr
@pytest.mark.slow_test
@pytest.mark.core_test
def test_exit_status_unknown_argument(salt_master, proxy_minion_id):
"""
Ensure correct exit status when an unknown argument is passed to

2
tests/pytests/integration/cli/test_salt_run.py
View file

@ -9,7 +9,7 @@ import salt.utils.pycrypto
import salt.utils.yaml
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

2
tests/pytests/integration/cli/test_salt_syndic.py
View file

@ -10,7 +10,7 @@ import salt.defaults.exitcodes
from tests.support.helpers import PRE_PYTEST_SKIP, PRE_PYTEST_SKIP_REASON
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

5
tests/pytests/integration/cli/test_syndic_eauth.py
View file

@ -8,6 +8,11 @@ import pytest
docker = pytest.importorskip("docker")
pytestmark = [
pytest.mark.core_test,
]
def json_output_to_dict(output):
"""
Convert ``salt ... --out=json`` Syndic return to a dictionary. Since the

4
tests/pytests/integration/daemons/test_masterapi.py
View file

@ -12,7 +12,9 @@ import salt.utils.files
import salt.utils.stringutils
from tests.support.runtests import RUNTIME_VARS
pytestmark = [pytest.mark.slow_test]
pytestmark = [
pytest.mark.slow_test,
]
@pytest.fixture

2
tests/pytests/integration/modules/test_beacons.py
View file

@ -10,7 +10,7 @@ import pytest
from tests.support.helpers import PRE_PYTEST_SKIP_OR_NOT
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
]

1
tests/pytests/integration/modules/test_useradd.py
View file

@ -7,6 +7,7 @@ from saltfactories.utils import random_string
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

3
tests/pytests/integration/proxy/test_deltaproxy.py
View file

@ -10,7 +10,8 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.skip_on_spawning_platform(
reason="Deltaproxy minions do not currently work on spawning platforms.",
)
),
pytest.mark.slow_test,
]

2
tests/pytests/integration/proxy/test_simple.py
View file

@ -8,6 +8,7 @@ import pytest
log = logging.getLogger(__name__)
@pytest.mark.core_test
def test_can_it_ping(salt_cli, salt_proxy):
"""
Ensure the proxy can ping
@ -16,6 +17,7 @@ def test_can_it_ping(salt_cli, salt_proxy):
assert ret.data is True
@pytest.mark.slow_test
def test_list_pkgs(salt_cli, salt_proxy):
"""
Package test 1, really just tests that the virtual function capability

2
tests/pytests/scenarios/failover/multimaster/test_failover_master.py
View file

@ -6,7 +6,7 @@ import time
import pytest
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.skip_on_freebsd(reason="Processes are not properly killed on FreeBSD"),
]

2
tests/pytests/scenarios/multimaster/test_multimaster.py
View file

@ -9,7 +9,7 @@ log = logging.getLogger(__name__)
ECHO_STR = "The FitnessGram Pacer Test is a multistage aerobic capacity test"
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
]

2
tests/pytests/scenarios/multimaster/test_offline_master.py
View file

@ -3,7 +3,7 @@ import time
import pytest
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
]

2
tests/pytests/scenarios/setup/test_install.py
View file

@ -17,7 +17,7 @@ from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.windows_whitelisted,
pytest.mark.skip_initial_onedir_failure,
pytest.mark.skip_if_binaries_missing(*KNOWN_BINARY_NAMES, check_all=False),

2
tests/pytests/scenarios/setup/test_man.py
View file

@ -11,7 +11,7 @@ import salt.utils.platform
from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
pytestmark = [
pytest.mark.slow_test,
pytest.mark.core_test,
pytest.mark.skip_on_windows,
pytest.mark.skip_on_aix,
pytest.mark.skip_initial_onedir_failure,

1
tests/pytests/unit/client/ssh/test_ssh.py
View file

@ -7,6 +7,7 @@ from tests.support.mock import MagicMock, patch
pytestmark = [
pytest.mark.skip_if_binaries_missing("ssh", "ssh-keygen", check_all=True),
pytest.mark.slow_test,
]

4
tests/pytests/unit/daemons/masterapi/test_local_funcs.py
View file

@ -5,7 +5,9 @@ import salt.daemons.masterapi as masterapi
import salt.utils.platform
from tests.support.mock import MagicMock, patch
pytestmark = [pytest.mark.slow_test]
pytestmark = [
pytest.mark.slow_test,
]
@pytest.fixture

4
tests/pytests/unit/daemons/masterapi/test_remote_funcs.py
View file

@ -5,7 +5,9 @@ import salt.daemons.masterapi as masterapi
import salt.utils.platform
from tests.support.mock import MagicMock, patch
pytestmark = [pytest.mark.slow_test]
pytestmark = [
pytest.mark.slow_test,
]
class FakeCache:

1
tests/pytests/unit/modules/test_gpg.py
View file

@ -22,6 +22,7 @@ pytest.importorskip("gnupg")
pytestmark = [
pytest.mark.skip_unless_on_linux,
pytest.mark.requires_random_entropy,
pytest.mark.slow_test,
]
log = logging.getLogger(__name__)

4
tests/pytests/unit/modules/test_zfs.py
View file

@ -18,6 +18,10 @@ from salt.utils.odict import OrderedDict
from tests.support.mock import MagicMock, patch
from tests.support.zfs import ZFSMockData
pytestmark = [
pytest.mark.slow_test,
]
@pytest.fixture
def utils_patch():

4
tests/pytests/unit/modules/test_zpool.py
View file

@ -19,6 +19,10 @@ from salt.utils.odict import OrderedDict
from tests.support.mock import MagicMock, patch
from tests.support.zfs import ZFSMockData
pytestmark = [
pytest.mark.slow_test,
]
@pytest.fixture
def utils_patch():

1
tests/pytests/unit/modules/win_lgpo/test_admx_policies.py
View file

@ -23,6 +23,7 @@ log = logging.getLogger(__name__)
pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
]

1
tests/pytests/unit/modules/win_lgpo/test_adv_audit_settings.py
View file

@ -9,6 +9,7 @@ pytestmark = [
pytest.mark.windows_whitelisted,
pytest.mark.skip_unless_on_windows,
pytest.mark.destructive_test,
pytest.mark.slow_test,
]

Some files were not shown because too many files have changed in this diff Show more