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

Merge pull request #64501 from s0undt3ch/hotfix/merge-forward

Browse source 
[master] Merge 3006.x into master
This commit is contained in:
Pedro Algarvio 2023-06-17 23:29:46 +01:00 • committed by GitHub
commit 4cfc91da62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2129,7 +2129,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }})\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
"text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }}): `${{ steps.get-workflow-info.outputs.conclusion }}`\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
}
]

2
.github/workflows/templates/nightly.yml.jinja vendored
View file

@ -133,7 +133,7 @@ concurrency:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }})\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
"text": "Nightly Workflow build result for the `${{ github.ref_name }}` branch(attempt: ${{ github.run_attempt }}): `${{ steps.get-workflow-info.outputs.conclusion }}`\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
}
]

2
pkg/tests/conftest.py
View file

@ -44,7 +44,7 @@ def grains(sminion):
return sminion.opts["grains"].copy()
@pytest.fixture(scope="module", autouse=True)
@pytest.fixture(scope="session", autouse=True)
def _system_up_to_date(
grains,
shell,

7
pkg/tests/integration/test_pkg.py
View file

@ -3,13 +3,6 @@ import sys
import pytest
@pytest.fixture(scope="module")
def grains(salt_call_cli):
ret = salt_call_cli.run("--local", "grains.items")
assert ret.data, ret
return ret.data
@pytest.fixture(scope="module")
def pkg_name(salt_call_cli, grains):
if sys.platform.startswith("win"):