Skip to content

Commit

Permalink
Merge pull request #53699 from s0undt3ch/features/f30-reqs-develop
Browse files Browse the repository at this point in the history 
[develop] Add Fedora 30 requirements files
  • Loading branch information
@s0undt3ch
s0undt3ch authored Jul 4, 2019
2 parents c4d39df + 0b00f5a commit 325a956
Show file tree
Hide file tree
Showing 54 changed files with 385 additions and 2,709 deletions.
15 changes: 12 additions & 3 deletions .ci/docs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ properties([
buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')),
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

def shell_header

node('docs') {
Expand Down Expand Up @@ -36,8 +45,8 @@ node('docs') {
sh shell_header + '''
eval "$(pyenv init -)"
pyenv --version
pyenv install --skip-existing 2.7.15
pyenv shell 2.7.15
pyenv install --skip-existing 3.6.8
pyenv shell 3.6.8
python --version
pip install -U nox-py2
nox --version
Expand All @@ -47,7 +56,7 @@ node('docs') {
stage('Build') {
sh shell_header + '''
eval "$(pyenv init -)"
pyenv shell 2.7.15
pyenv shell 3.6.8
nox -e docs
'''
archiveArtifacts artifacts: 'doc/doc-archive.tar.gz'
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-centos7-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-debian8-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-debian9-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-fedora29-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-ubuntu1604-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-ubuntu1804-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
9 changes: 9 additions & 0 deletions .ci/kitchen-windows2016-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ properties([
])
])

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

node('kitchen-slave') {
timeout(time: global_timeout, unit: 'HOURS') {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding',
Expand Down
61 changes: 50 additions & 11 deletions .ci/lint
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ properties([

def shell_header

// Be sure to cancel any previously running builds
def buildNumber = env.BUILD_NUMBER as int
if (buildNumber > 1) {
// This will cancel the previous build which also defined a matching milestone
milestone(buildNumber - 1)
}
// Define a milestone for this build so that, if another build starts, this one will be aborted
milestone(buildNumber)

def lint_report_issues = []

node('lint') {
timeout(time: global_timeout, unit: 'HOURS') {
ansiColor('xterm') {
Expand Down Expand Up @@ -46,8 +57,8 @@ node('lint') {
(git diff --name-status -l99999 -C "origin/${SALT_TARGET_BRANCH}" "origin/$BRANCH_NAME";echo "---";git diff --name-status -l99999 -C "origin/$BRANCH_NAME";printenv|grep -E '=[0-9a-z]{40,}+$|COMMIT=|BRANCH') > file-list-experiment.log
eval "$(pyenv init -)"
pyenv --version
pyenv install --skip-existing 2.7.15
pyenv shell 2.7.15
pyenv install --skip-existing 3.6.8
pyenv shell 3.6.8
python --version
pip install -U nox-py2
nox --version
Expand All @@ -56,7 +67,10 @@ node('lint') {
nox --install-only -e lint-tests
'''
}
archiveArtifacts artifacts: 'file-list-status.log,file-list-changed.log,file-list-deleted.log,file-list-experiment.log'
archiveArtifacts(
artifacts: 'file-list-status.log,file-list-changed.log,file-list-deleted.log,file-list-experiment.log',
allowEmptyArchive: true
)
}

stage('Lint Changes') {
Expand All @@ -67,7 +81,7 @@ node('lint') {
if (readFile('file-list-changed.log') =~ /(?i)(^|\n)(salt\/.*\.py|setup\.py)\n/) {
sh shell_header + '''
eval "$(pyenv init - --no-rehash)"
pyenv shell 2.7.15
pyenv shell 3.6.8
EC=254
export PYLINT_REPORT=pylint-report-salt-chg.log
grep -Ei '^salt/.*\\.py$|^setup\\.py$' file-list-changed.log | xargs -r '--delimiter=\\n' nox -e lint-salt --
Expand All @@ -82,7 +96,7 @@ node('lint') {
if (readFile('file-list-changed.log') =~ /(?i)(^|\n)tests\/.*\.py\n/) {
sh shell_header + '''
eval "$(pyenv init - --no-rehash)"
pyenv shell 2.7.15
pyenv shell 3.6.8
EC=254
export PYLINT_REPORT=pylint-report-tests-chg.log
grep -Ei '^tests/.*\\.py$' file-list-changed.log | xargs -r '--delimiter=\\n' nox -e lint-tests --
Expand All @@ -95,7 +109,10 @@ node('lint') {
)
} finally {
def changed_logs_pattern = 'pylint-report-*-chg.log'
archiveArtifacts artifacts: changed_logs_pattern, allowEmptyArchive: true
archiveArtifacts(
artifacts: changed_logs_pattern,
allowEmptyArchive: true
)
if (env.NODE_NAME.startsWith('jenkins-pr-')) {
step([$class: 'WarningsPublisher',
parserConfigurations: [[
Expand All @@ -108,7 +125,11 @@ node('lint') {
usePreviousBuildAsReference: true
])
} else {
recordIssues(enabledForFailure: true, tool: pyLint(pattern: changed_logs_pattern, reportEncoding: 'UTF-8'))
lint_report_issues.add(
scanForIssues(
tool: pyLint(pattern: changed_logs_pattern, reportEncoding: 'UTF-8')
)
)
}
}
}
Expand All @@ -127,7 +148,7 @@ node('lint') {
stage('Lint Salt Full') {
sh shell_header + '''
eval "$(pyenv init - --no-rehash)"
pyenv shell 2.7.15
pyenv shell 3.6.8
EC=254
export PYLINT_REPORT=pylint-report-salt-full.log
nox -e lint-salt
Expand All @@ -140,7 +161,7 @@ node('lint') {
stage('Lint Tests Full') {
sh shell_header + '''
eval "$(pyenv init - --no-rehash)"
pyenv shell 2.7.15
pyenv shell 3.6.8
EC=254
export PYLINT_REPORT=pylint-report-tests-full.log
nox -e lint-salt
Expand All @@ -152,7 +173,10 @@ node('lint') {
)
} finally {
def full_logs_pattern = 'pylint-report-*-full.log'
archiveArtifacts artifacts: full_logs_pattern, allowEmptyArchive: true
archiveArtifacts(
artifacts: full_logs_pattern,
allowEmptyArchive: true
)
if (env.NODE_NAME.startsWith('jenkins-pr-')) {
step([$class: 'WarningsPublisher',
parserConfigurations: [[
Expand All @@ -165,14 +189,29 @@ node('lint') {
usePreviousBuildAsReference: true
])
} else {
recordIssues(enabledForFailure: true, tool: pyLint(pattern: full_logs_pattern, reportEncoding: 'UTF-8'))
lint_report_issues.add(
scanForIssues(
tool: pyLint(pattern: full_logs_pattern, reportEncoding: 'UTF-8')
)
)
}
}
}
}
} catch (Exception e) {
currentBuild.result = 'FAILURE'
} finally {
if (!env.NODE_NAME.startsWith('jenkins-pr-')) {
publishIssues(
enabledForFailure: true,
aggregatingResults: true,
referenceJobName: "${salt_target_branch}/salt-${salt_target_branch}-lint",
qualityGates: [
[threshold: 1, type: 'TOTAL', unstable: false]
],
issues: lint_report_issues
)
}
cleanWs notFailBuild: true
if (currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
if (env.NODE_NAME.startsWith('jenkins-pr-')) {
Expand Down
Loading

0 comments on commit 325a956

Please sign in to comment.