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

Dumb commit #2

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion .test-infra/dockerized-jenkins/seedjobconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/apache/beam.git</url>
<url>https://github.com/damgadbot/beam.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
Expand Down
54 changes: 52 additions & 2 deletions .test-infra/jenkins/CommonJobProperties.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class CommonJobProperties {
String jenkinsExecutorLabel = 'beam') {
// GitHub project.
context.properties {
githubProjectUrl('https://github.com/apache/beam/')
githubProjectUrl('https://github.com/damgadbot/beam/')
}

// Set JDK version.
Expand All @@ -52,7 +52,7 @@ class CommonJobProperties {
context.scm {
git {
remote {
github("apache/beam")
github("damgadbot/beam")
// Single quotes here mean that ${ghprbPullId} is not interpolated and instead passed
// through to Jenkins where it refers to the environment variable.
refspec('+refs/heads/*:refs/remotes/origin/* ' +
Expand Down Expand Up @@ -143,7 +143,57 @@ class CommonJobProperties {
completedStatus('FAILURE', '--none--')
completedStatus('ERROR', '--none--')
}

ghbrpBuildStatus([
new org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildResultMessage('SUCCESS', successComment)
// ghprbBuildResultMessage {
// result('SUCCESS')
// message(successComment)
// },
// ghprbBuildResultMessage {
// result('FAILURE')
// message('--none--')
// },
// ghprbBuildResultMessage {
// result('ERROR')
// message('--none--')
// }
])
ghprbCancelBuildsOnUpdate {
overrideGlobal(true)
}

}

// The configure block gives access to the raw XML.
// This is needed here because the ghprb DSL extension doesn't
// provide access to the credentials to use.
configure { node ->
def triggers = node / 'triggers'
// Iterate and find the right trigger node so that this
// doesn't depend on the version of the ghprb plugin.
triggers.children().each { trigger ->
if (trigger.name() == 'org.jenkinsci.plugins.ghprb.GhprbTrigger') {
// This adds the <gitHubAuthId/> tag with the pytorchbot credentials
def gitHubAuthId = trigger / 'gitHubAuthId'
gitHubAuthId.setValue(githubAuthIdValue)

def extensions = trigger / 'extensions'
if (!reportStatus) {
// Replace default extension with a single one that
// instructs ghprb to not set any commit status.
// We rely on the downstream jobs to do this.
def statusNode = { "org.jenkinsci.plugins.ghprb.extensions.status.${it}" }
extensions.remove(extensions / statusNode('GhprbSimpleStatus'))
extensions / statusNode('GhprbNoCommitStatus')
}

// Cancel PR builds when there is an update
def buildNode = { "org.jenkinsci.plugins.ghprb.extensions.build.${it}" }
extensions / buildNode('GhprbCancelBuildsOnUpdate')
}
}

}
}
}
Expand Down
4 changes: 2 additions & 2 deletions .test-infra/jenkins/job_00_seed.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ job('beam_SeedJob') {
' on Jenkins DSL groovy files checked into the code repository.')

properties {
githubProjectUrl('https://github.com/apache/beam/')
githubProjectUrl('https://github.com/damgadbot/beam/')
}

// Restrict to only run on Jenkins executors labeled 'beam'
Expand All @@ -35,7 +35,7 @@ job('beam_SeedJob') {
scm {
git {
remote {
github('apache/beam')
github('damgadbot/beam')

// ${ghprbPullId} is not interpolated by groovy, but passed through to Jenkins where it
// refers to the environment variable
Expand Down
4 changes: 2 additions & 2 deletions .test-infra/jenkins/job_seed_standalone.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ job('beam_SeedJob_Standalone') {
' on Jenkins DSL groovy files checked into the code repository.')

properties {
githubProjectUrl('https://github.com/apache/beam/')
githubProjectUrl('https://github.com/damgadbot/beam/')
}

// Restrict to only run on Jenkins executors labeled 'beam'
Expand All @@ -35,7 +35,7 @@ job('beam_SeedJob_Standalone') {
scm {
git {
remote {
github('apache/beam')
github('damgadbot/beam')

// ${ghprbPullId} is not interpolated by groovy, but passed through to Jenkins where it
// refers to the environment variable
Expand Down
10 changes: 5 additions & 5 deletions .test-infra/metrics/grafana/dashboards/code_velocity.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"targetBlank": true,
"title": "Link to oldest open PRs",
"type": "absolute",
"url": "https://github.com/apache/beam/pulls?q=is%3Apr+is%3Aopen+sort%3Acreated-asc"
"url": "https://github.com/damgadbot/beam/pulls?q=is%3Apr+is%3Aopen+sort%3Acreated-asc"
}
],
"mappingType": 1,
Expand Down Expand Up @@ -158,7 +158,7 @@
"targetBlank": true,
"title": "Link to oldest open PRs",
"type": "absolute",
"url": "https://github.com/apache/beam/pulls?q=is%3Apr+is%3Aopen+sort%3Acreated-asc"
"url": "https://github.com/damgadbot/beam/pulls?q=is%3Apr+is%3Aopen+sort%3Acreated-asc"
}
],
"mappingType": 1,
Expand Down Expand Up @@ -265,7 +265,7 @@
"targetBlank": true,
"title": "Least updated CLs",
"type": "absolute",
"url": "https://github.com/apache/beam/pulls?q=is%3Aopen+is%3Apr+sort%3Aupdated-asc"
"url": "https://github.com/damgadbot/beam/pulls?q=is%3Aopen+is%3Apr+sort%3Aupdated-asc"
}
],
"mappingType": 1,
Expand Down Expand Up @@ -371,7 +371,7 @@
{
"title": "Least updated PRs",
"type": "absolute",
"url": "https://github.com/apache/beam/pulls?q=is%3Aopen+is%3Apr+sort%3Aupdated-asc"
"url": "https://github.com/damgadbot/beam/pulls?q=is%3Aopen+is%3Apr+sort%3Aupdated-asc"
}
],
"mappingType": 1,
Expand Down Expand Up @@ -487,7 +487,7 @@
"link": true,
"linkTargetBlank": true,
"linkTooltip": "PR",
"linkUrl": "https://github.com/apache/beam/pull/${__cell:raw}",
"linkUrl": "https://github.com/damgadbot/beam/pull/${__cell:raw}",
"mappingType": 1,
"pattern": "pr_id",
"thresholds": [],
Expand Down
4 changes: 2 additions & 2 deletions .test-infra/metrics/sync/github/queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

'''
This query is used to fetch PR data from github via Github API v4 (GraphQL).
Returns PRs on apache/beam repo that are older than provided timestamp.
Returns PRs on damgadbot/beam repo that are older than provided timestamp.
Time format "2017-10-26T20:00:00Z
'''
MAIN_PR_QUERY = '''
query {
search(query: "type:pr repo:apache/beam updated:><TemstampSubstitueLocation> sort:updated-asc", type: ISSUE, first: 100) {
search(query: "type:pr repo:damgadbot/beam updated:><TemstampSubstitueLocation> sort:updated-asc", type: ISSUE, first: 100) {
issueCount
pageInfo {
endCursor
Expand Down
12 changes: 12 additions & 0 deletions sdks/python/look_great_new_file_here.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
change no 1
change no 2
change no 3
change no 4
change no 5
change no 6
change no 6
change no 6
change no 9
change no 10
change no 11