Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump junit from 1198.ve38db_d1b_c975 to 1202.v79a_986785076 in /bom-weekly #50

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@ updates:
- package-ecosystem: "maven"
open-pull-requests-limit: 10
directory: "/sample-plugin"
reviewers:
- "jglick"
schedule:
interval: "daily"
- package-ecosystem: "maven"
open-pull-requests-limit: 25
directory: "/bom-weekly"
reviewers:
- "jglick"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
name: cd
on:
workflow_dispatch:
check_run:
types:
- completed

jobs:
maven-cd:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/sync-release-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Sync release branch
on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:
jobs:
sync:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: release
- run: |
git fetch origin
git reset --hard origin/master
git rebase origin/release
- uses: peter-evans/create-pull-request@v5
with:
title: Merge branch `master` into `release`
branch: sync-release-branch
delete-branch: true
59 changes: 34 additions & 25 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
properties([disableConcurrentBuilds(abortPrevious: true), buildDiscarder(logRotator(numToKeepStr: '7'))])
def props = [disableConcurrentBuilds(abortPrevious: true), buildDiscarder(logRotator(numToKeepStr: '7'))]

if (BRANCH_NAME == 'master' && currentBuild.buildCauses*._class == ['jenkins.branch.BranchEventCause']) {
error 'No longer running builds on response to master branch pushes. If you wish to cut a release, use “Re-run checks” from this failing check in https://github.com/jenkinsci/bom/commits/master'
if (env.BRANCH_NAME == 'release') {
props.add(pipelineTriggers([cron('30 10 * * 2')]))
}

properties props

if (env.BRANCH_NAME == 'release' && currentBuild.buildCauses*._class == ['jenkins.branch.BranchEventCause']) {
error 'No longer running builds on response to release branch pushes. If you wish to cut an out-of-order release, use “Re-run checks” from this failing check in https://github.com/jenkinsci/bom/commits/release'
}

def mavenEnv(Map params = [:], Closure body) {
Expand Down Expand Up @@ -44,6 +50,7 @@ def parsePlugins(plugins) {
def pluginsByRepository
def lines
def fullTest = env.CHANGE_ID && pullRequest.labels.contains('full-test')
def isSubset = env.BRANCH_NAME == 'master' || (env.CHANGE_ID && env.CHANGE_TARGET == 'master' && !pullRequest.labels.contains('skip-subset'))

stage('prep') {
mavenEnv(jdk: 11) {
Expand Down Expand Up @@ -84,32 +91,34 @@ stage('prep') {
}
}

branches = [failFast: !fullTest]
lines.each {line ->
pluginsByRepository.each { repository, plugins ->
branches["pct-$repository-$line"] = {
def jdk = line == 'weekly' ? 17 : 11
mavenEnv(jdk: jdk) {
unstash line
withEnv([
"PLUGINS=${plugins.join(',')}",
"LINE=$line",
'EXTRA_MAVEN_PROPERTIES=maven.test.failure.ignore=true:surefire.rerunFailingTestsCount=1'
]) {
sh 'bash pct.sh'
}
launchable.install()
withCredentials([string(credentialsId: 'launchable-jenkins-bom', variable: 'LAUNCHABLE_TOKEN')]) {
launchable('verify')
def sessionFile = "launchable-session-${line}.txt"
unstash sessionFile
def session = readFile(sessionFile).trim()
launchable("record tests --session ${session} --group ${repository} maven './**/target/surefire-reports' './**/target/failsafe-reports'")
if (!isSubset) {
branches = [failFast: !fullTest]
lines.each {line ->
pluginsByRepository.each { repository, plugins ->
branches["pct-$repository-$line"] = {
def jdk = line == 'weekly' ? 17 : 11
mavenEnv(jdk: jdk) {
unstash line
withEnv([
"PLUGINS=${plugins.join(',')}",
"LINE=$line",
'EXTRA_MAVEN_PROPERTIES=maven.test.failure.ignore=true:surefire.rerunFailingTestsCount=1'
]) {
sh 'bash pct.sh'
}
launchable.install()
withCredentials([string(credentialsId: 'launchable-jenkins-bom', variable: 'LAUNCHABLE_TOKEN')]) {
launchable('verify')
def sessionFile = "launchable-session-${line}.txt"
unstash sessionFile
def session = readFile(sessionFile).trim()
launchable("record tests --session ${session} --group ${repository} maven './**/target/surefire-reports' './**/target/failsafe-reports'")
}
}
}
}
}
parallel branches
}
parallel branches

infra.maybePublishIncrementals()
2 changes: 1 addition & 1 deletion bom-weekly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1198.ve38db_d1b_c975</version>
<version>1202.v79a_986785076</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sample-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.61</version>
<version>4.62</version>
<relativePath />
</parent>
<groupId>io.jenkins.tools.bom</groupId>
Expand Down