mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Drop Ubuntu 18.04
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
94d6603ea1
commit
315e1c437d
8 changed files with 0 additions and 93 deletions
3
.github/workflows/build-deb-repo.yml
vendored
3
.github/workflows/build-deb-repo.yml
vendored
|
@ -49,9 +49,6 @@ jobs:
|
|||
- distro: debian
|
||||
version: "11"
|
||||
arch: aarch64
|
||||
- distro: ubuntu
|
||||
version: "18.04"
|
||||
arch: x86_64
|
||||
- distro: ubuntu
|
||||
version: "20.04"
|
||||
arch: x86_64
|
||||
|
|
17
.github/workflows/ci.yml
vendored
17
.github/workflows/ci.yml
vendored
|
@ -675,22 +675,6 @@ jobs:
|
|||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-1804:
|
||||
name: Ubuntu 18.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: ubuntu-18.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
@ -786,7 +770,6 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- ubuntu-1804
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
17
.github/workflows/nightly.yml
vendored
17
.github/workflows/nightly.yml
vendored
|
@ -673,22 +673,6 @@ jobs:
|
|||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-1804:
|
||||
name: Ubuntu 18.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: ubuntu-18.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
@ -790,7 +774,6 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- ubuntu-1804
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
17
.github/workflows/scheduled.yml
vendored
17
.github/workflows/scheduled.yml
vendored
|
@ -673,22 +673,6 @@ jobs:
|
|||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-1804:
|
||||
name: Ubuntu 18.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: ubuntu-18.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-2004:
|
||||
name: Ubuntu 20.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
|
@ -784,7 +768,6 @@ jobs:
|
|||
- opensuse-15
|
||||
- photonos-3
|
||||
- photonos-4
|
||||
- ubuntu-1804
|
||||
- ubuntu-2004
|
||||
- ubuntu-2004-arm64
|
||||
- ubuntu-2204
|
||||
|
|
17
.github/workflows/templates/ci.yml.jinja
vendored
17
.github/workflows/templates/ci.yml.jinja
vendored
|
@ -569,23 +569,6 @@ on:
|
|||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-1804:
|
||||
<%- do test_salt_needs.append('ubuntu-1804') %>
|
||||
name: Ubuntu 18.04
|
||||
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
|
||||
needs:
|
||||
- prepare-workflow
|
||||
- build-salt-onedir
|
||||
uses: ./.github/workflows/test-action.yml
|
||||
with:
|
||||
distro-slug: ubuntu-18.04
|
||||
nox-session: ci-test-onedir
|
||||
platform: linux
|
||||
arch: x86_64
|
||||
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
|
||||
ubuntu-2004:
|
||||
<%- do test_salt_needs.append('ubuntu-2004') %>
|
||||
name: Ubuntu 20.04
|
||||
|
|
|
@ -8,7 +8,6 @@ debian-11-arm64: ami-04e4cf9e06c8507fd
|
|||
debian-11-amd64: ami-0bdd4ad44797176d5
|
||||
opensuse-15-x86_64: ami-0f082f48aaf8d7025
|
||||
photon-3-x86_64: ami-0796b16d4f04f5f39
|
||||
ubuntu-1804-amd64: ami-025d583cda1198992
|
||||
ubuntu-2004-arm64: ami-0274b3bc5e9f97e25
|
||||
ubuntu-2004-amd64: ami-09721ea22726563cd
|
||||
ubuntu-2204-amd64: ami-007efe8c00884373a
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
@Library('salt@master-1.11') _
|
||||
|
||||
runTestSuite(
|
||||
concurrent_builds: 1,
|
||||
distro_name: 'ubuntu',
|
||||
distro_version: '1804',
|
||||
distro_arch: 'amd64',
|
||||
env: env,
|
||||
jenkins_slave_label: 'kitchen-slave',
|
||||
nox_env_name: 'pytest-zeromq',
|
||||
nox_passthrough_opts: '--ssh-tests',
|
||||
python_version: 'py3',
|
||||
testrun_timeout: 6,
|
||||
use_spot_instances: true,
|
||||
)
|
||||
|
||||
// vim: ft=groovy
|
|
@ -136,10 +136,6 @@ def debian(
|
|||
},
|
||||
},
|
||||
"ubuntu": {
|
||||
"18.04": {
|
||||
"label": "salt_ubuntu1804",
|
||||
"codename": "bionic",
|
||||
},
|
||||
"20.04": {
|
||||
"label": "salt_ubuntu2004",
|
||||
"codename": "focal",
|
||||
|
|
Loading…
Add table
Reference in a new issue