Merge branch 'stable-3.1'
* stable-3.1: Update webhooks plugin to latest master revision Delete unused download command general preference Remove theme preferences Remove key_map_type edit preference Update description of git_basic_auth_policy field in AuthInfo Delete unused GroupDetail and GroupInfo classes Delete unused JdbcUtil class Schema_181: Fix typo in UI message Fix wrong javadoc tags Update git submodules Documentation: Fix java SDK typo in dev-eclipse.txt Upgrade jackson-core to 2.10.2 Fix failures on performance.measure with undefined mark name Reduce change spamming from CI Link checker result to the proper console URL Remove unused createCheckPayload() method Bazel: Force sourcemaps inlining in polymer bundler Change-Id: Id3aaf78c88434d8878a56813ddc753044ba19881
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
This document is about configuring Gerrit Code Review into an
|
This document is about configuring Gerrit Code Review into an
|
||||||
Eclipse workspace for development.
|
Eclipse workspace for development.
|
||||||
|
|
||||||
Java 8 or later SDK is require
|
Java 8 or later SDK is required.
|
||||||
|
|
||||||
[[setup]]
|
[[setup]]
|
||||||
== Project Setup
|
== Project Setup
|
||||||
|
|||||||
40
Jenkinsfile
vendored
40
Jenkinsfile
vendored
@@ -23,7 +23,6 @@ class Globals {
|
|||||||
static final long curlTimeout = 10000
|
static final long curlTimeout = 10000
|
||||||
static final int waitForResultTimeout = 10000
|
static final int waitForResultTimeout = 10000
|
||||||
static final String gerritRepositoryNameSha1Suffix = "-a6a0e4682515f3521897c5f950d1394f4619d928"
|
static final String gerritRepositoryNameSha1Suffix = "-a6a0e4682515f3521897c5f950d1394f4619d928"
|
||||||
static final resTicks = [ 'ABORTED':'\u26aa', 'SUCCESS':'\u2705', 'FAILURE':'\u274c' ]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Change {
|
class Change {
|
||||||
@@ -54,11 +53,13 @@ class Builds {
|
|||||||
class GerritCheck {
|
class GerritCheck {
|
||||||
String uuid
|
String uuid
|
||||||
Build build
|
Build build
|
||||||
|
String consoleUrl
|
||||||
|
|
||||||
GerritCheck(name, build) {
|
GerritCheck(name, build) {
|
||||||
this.uuid = "gerritforge:" + name.replaceAll("(bazel/)", "") +
|
this.uuid = "gerritforge:" + name.replaceAll("(bazel/)", "") +
|
||||||
Globals.gerritRepositoryNameSha1Suffix
|
Globals.gerritRepositoryNameSha1Suffix
|
||||||
this.build = build
|
this.build = build
|
||||||
|
this.consoleUrl = "${build.url}console"
|
||||||
}
|
}
|
||||||
|
|
||||||
def getCheckResultFromBuild() {
|
def getCheckResultFromBuild() {
|
||||||
@@ -74,14 +75,6 @@ class GerritCheck {
|
|||||||
return "FAILED"
|
return "FAILED"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def createCheckPayload() {
|
|
||||||
return JsonOutput.toJson([
|
|
||||||
checker_uuid: uuid,
|
|
||||||
state: getCheckResultFromBuild(),
|
|
||||||
url: "${build.url}consoleText"
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def hasChangeNumber() {
|
def hasChangeNumber() {
|
||||||
@@ -89,7 +82,7 @@ def hasChangeNumber() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def postCheck(check) {
|
def postCheck(check) {
|
||||||
gerritCheck(checks: [ "${check.uuid}" : "${check.getCheckResultFromBuild()}" ])
|
gerritCheck(checks: [ "${check.uuid}" : "${check.getCheckResultFromBuild()}" ], url: "${check.consoleUrl}")
|
||||||
}
|
}
|
||||||
|
|
||||||
def queryChangedFiles(url, changeNum, sha1) {
|
def queryChangedFiles(url, changeNum, sha1) {
|
||||||
@@ -247,25 +240,6 @@ def findCodestyleFilesInLog(build) {
|
|||||||
return codeStyleFiles
|
return codeStyleFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
def createCodeStyleMsgBody(build, label) {
|
|
||||||
def codeStyleFiles = findCodestyleFilesInLog(build)
|
|
||||||
def formattingMsg = label < 0 ? ('The following files need formatting:\n ' +
|
|
||||||
codeStyleFiles.join('\n ')) : 'All files are correctly formatted'
|
|
||||||
def url = build.url + "consoleText"
|
|
||||||
|
|
||||||
return "${Globals.resTicks[build.result]} $formattingMsg\n (${url})"
|
|
||||||
}
|
|
||||||
|
|
||||||
def createVerifyMsgBody(builds) {
|
|
||||||
def msgList = builds.collect { type, build -> [
|
|
||||||
'type': type, 'res': build.result, 'url': build.url + "consoleText" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
return msgList.collect {
|
|
||||||
"${Globals.resTicks[it.res]} ${it.type} : ${it.res}\n (${it.url})"
|
|
||||||
} .join('\n')
|
|
||||||
}
|
|
||||||
|
|
||||||
node ('master') {
|
node ('master') {
|
||||||
|
|
||||||
if (hasChangeNumber()) {
|
if (hasChangeNumber()) {
|
||||||
@@ -292,18 +266,14 @@ node ('master') {
|
|||||||
|
|
||||||
stage('Report to Gerrit'){
|
stage('Report to Gerrit'){
|
||||||
resCodeStyle = getLabelValue(1, Builds.codeStyle.result)
|
resCodeStyle = getLabelValue(1, Builds.codeStyle.result)
|
||||||
gerritReview(
|
gerritReview labels: ['Code-Style': resCodeStyle]
|
||||||
labels: ['Code-Style': resCodeStyle],
|
|
||||||
message: createCodeStyleMsgBody(Builds.codeStyle, resCodeStyle))
|
|
||||||
postCheck(new GerritCheck("codestyle", Builds.codeStyle))
|
postCheck(new GerritCheck("codestyle", Builds.codeStyle))
|
||||||
|
|
||||||
def verificationResults = Builds.verification.collect { k, v -> v }
|
def verificationResults = Builds.verification.collect { k, v -> v }
|
||||||
def resVerify = verificationResults.inject(1) {
|
def resVerify = verificationResults.inject(1) {
|
||||||
acc, build -> getLabelValue(acc, build.result)
|
acc, build -> getLabelValue(acc, build.result)
|
||||||
}
|
}
|
||||||
gerritReview(
|
gerritReview labels: ['Verified': resVerify]
|
||||||
labels: ['Verified': resVerify],
|
|
||||||
message: createVerifyMsgBody(Builds.verification))
|
|
||||||
|
|
||||||
Builds.verification.each { type, build -> postCheck(
|
Builds.verification.each { type, build -> postCheck(
|
||||||
new GerritCheck(type, build)
|
new GerritCheck(type, build)
|
||||||
|
|||||||
Submodule plugins/webhooks updated: b620659883...377fec17d2
@@ -323,6 +323,7 @@ def _bundle_impl(ctx):
|
|||||||
"$p/" + ctx.file._bundler_archive.path,
|
"$p/" + ctx.file._bundler_archive.path,
|
||||||
"--inline-scripts",
|
"--inline-scripts",
|
||||||
"--inline-css",
|
"--inline-css",
|
||||||
|
"--sourcemaps",
|
||||||
"--strip-comments",
|
"--strip-comments",
|
||||||
"--out-file",
|
"--out-file",
|
||||||
"$p/" + bundled.path,
|
"$p/" + bundled.path,
|
||||||
|
|||||||
@@ -108,8 +108,8 @@ def declare_nongoogle_deps():
|
|||||||
|
|
||||||
maven_jar(
|
maven_jar(
|
||||||
name = "jackson-core",
|
name = "jackson-core",
|
||||||
artifact = "com.fasterxml.jackson.core:jackson-core:2.10.1",
|
artifact = "com.fasterxml.jackson.core:jackson-core:2.10.2",
|
||||||
sha1 = "2c8b5e26ba40e5f91eb37a24075a2028b402c5f9",
|
sha1 = "73d4322a6bda684f676a2b5fe918361c4e5c7cca",
|
||||||
)
|
)
|
||||||
|
|
||||||
# Test-only dependencies below.
|
# Test-only dependencies below.
|
||||||
|
|||||||
Reference in New Issue
Block a user