-
Notifications
You must be signed in to change notification settings - Fork 545
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1275 from rallytime/merge-stable
[stable] Merge develop into stable for new release
- Loading branch information
Showing
6 changed files
with
623 additions
and
276 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ Adam Wright hipikat [email protected] | |
| Alec Koumjian akoumjian [email protected] | ||
| Alex Van't Hof alexvh | ||
| Alexander Krasnukhin themalkolm [email protected] | ||
| Alexandru Avadanii alexandruavadanii [email protected] | ||
| Alexey dmitrievav | ||
| Ali Rizvi-Santiago arizvisa | ||
| amendlik amendlik | ||
|
|
@@ -69,6 +70,7 @@ Guillaume Derval GuillaumeDerval [email protected] | |
| gweis gweis | ||
| Henrik Holmboe holmboe | ||
| Howard Mei HowardMei [email protected] | ||
| Jan Heidbrink jheidbrink | ||
| James Booth absolutejam [email protected] | ||
| Jared E Stroud jaredestroud [email protected] | ||
| Jasper Lievisse Adriaanse jasperla [email protected] | ||
|
|
@@ -80,6 +82,7 @@ Justin Anderson justinta [email protected] | |
| Justin Findlay jfindlay [email protected] | ||
| Karl Grzeszczak karlgrz | ||
| Kenneth Wilke KennethWilke | ||
| Ky-Anh Huynh icy | ||
| lomeroe lomeroe | ||
| Liu Xiaohui oreh [email protected] | ||
| Lorenzo Perone lopezio [email protected] | ||
|
|
@@ -96,11 +99,13 @@ Matthew Mead-Briggs mattmb | |
| Matthew Richardson mrichar1 | ||
| Matthew Willson ixela | ||
| Matthieu Guegan mguegan | ||
| mfapouw mfapouw | ||
| Michael A. Smith kojiromike [email protected] | ||
| Michael Scherer mscherer | ||
| Michele Bologna mbologna [email protected] | ||
| Mike Carlson m87carlson [email protected] | ||
| Mike Place cachedout [email protected] | ||
| N noelmcloughlin [email protected] | ||
| nasenbaer13 nasenbaer13 | ||
| nevins-b nevins-b | ||
| Nicole Thomas rallytime [email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| import java.util.Random | ||
|
|
||
| Random rand = new Random() | ||
|
|
||
| // ONLY CHANGE THIS BIT PLEASE | ||
| def baseDistros = ["debian8", | ||
| "suse", | ||
| "centos6", | ||
| "arch", | ||
| "ubuntu-14.04", | ||
| "ubuntu-18.04", | ||
| "windows", | ||
| ] | ||
| def versions = ["stable", "git", "stable-old"] | ||
|
|
||
| def basePrDistros = ["ubuntu-16.04", | ||
| "centos7"] | ||
|
|
||
| def prVersions = ["stable", "git"] | ||
|
|
||
| // You probably shouldn't be messing with this stuff down here | ||
|
|
||
| def distros = (baseDistros + basePrDistros).unique() | ||
|
|
||
| def notifySuccessful(String stageName) { | ||
| slackSend (color: '#00FF00', message: "SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})" + "\n Stage -- " + stageName) | ||
| } | ||
|
|
||
| def notifyFailed(String stageName) { | ||
| slackSend (color: '#FF0000', message: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})" + "\n Stage -- " + stageName) | ||
| } | ||
|
|
||
| def runKitchen(String distro) { | ||
| echo "kitchen create ${distro}" | ||
| echo "kitchen converge ${distro}" | ||
| echo "kitchen destroy ${distro}" | ||
| } | ||
|
|
||
| def distroversions = [] | ||
| for (d in distros) { | ||
| for (v in versions) { | ||
| distroversions = distroversions + ["${d}-${v}"] | ||
| } | ||
| } | ||
|
|
||
| def prDistros = (basePrDistros + distros[rand.nextInt(baseDistros.size())]).unique() | ||
|
|
||
| def prDistroversions = [] | ||
| for (d in prDistros) { | ||
| for (v in prVersions) { | ||
| prDistroversions = prDistroversions + ["${d}-${v}"] | ||
| } | ||
| } | ||
|
|
||
| def makeSetupRuns(dv) { | ||
| return { | ||
| node { | ||
| runKitchen("${dv}") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def setupRuns = distroversions.collectEntries { | ||
| ["kitchen-${it}" : makeSetupRuns("${it}")] | ||
| } | ||
|
|
||
| def prSetupRuns = prDistroversions.collectEntries { | ||
| ["kitchen-${it}" : makeSetupRuns("${it}")] | ||
| } | ||
|
|
||
| node ('bootstrap') { | ||
| timestamps { | ||
| ansiColor('xterm') { | ||
| stage('checkout') { checkout scm } | ||
| stage('shellcheck') { | ||
| sh 'stack exec -- shellcheck -s sh -f checkstyle bootstrap-salt.sh | tee checkstyle.xml' | ||
| checkstyle canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/checkstyle.xml', unHealthy: '', unstableTotalAll: '0' | ||
| archiveArtifacts artifacts: '**/checkstyle.xml' | ||
| } | ||
| // if (env.CHANGE_ID) { | ||
| // // Running for a PR only runs against 4 random distros from a shorter list | ||
| // stage('kitchen-pr') { | ||
| // parallel prSetupRuns | ||
| // } | ||
| // } else { | ||
| // // If we're not running for a pr we run *everything* | ||
| // stage('kitchen-all') { | ||
| // parallel setupRuns | ||
| // } | ||
| // } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * TODO: | ||
| * 1. Tests for each supported distro in bootstrap + branch shellcheck test (Shellcheck should be done) | ||
| * 2. Each distro needs a "stable" install (installs stable packages from our repo) and a "git" install (installs off of a git tag) | ||
| * 3. Running against each branch (stable, develop) | ||
| * 4. And probably a small subset against each pull request (similar to what we do in salt) | ||
| * | ||
| * Distros to check: | ||
| * Debian 8 | ||
| * Suse 42.1 | ||
| * CentOS 7 | ||
| * CentOS 6 | ||
| * Arch | ||
| * Ubuntu 16.04 | ||
| * Ubuntu 14.04 | ||
| * Windows | ||
| * | ||
| * Runs each against develop and stable | ||
| * | ||
| */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.