diff --git a/jenkins_home/config.xml b/jenkins_home/config.xml index abd7cab5594..badd35692b3 100644 --- a/jenkins_home/config.xml +++ b/jenkins_home/config.xml @@ -51,7 +51,7 @@ ubuntu-16-04 - 30 + 20 0 @@ -86,7 +86,7 @@ ubuntu-16-04-build - 10 + 20 0 @@ -176,6 +176,28 @@ false + + + All Jobs + false + false + + + + + + + + + + + + + + + .* + true + All 50000 @@ -190,13 +212,11 @@ - + - 9 - BAZEL_BUILD_ARGS - --hazelcast_node=hazelcast.hazelcast.svc.cluster.local --spawn_strategy=remote + 8 BAZEL_STARTUP_ARGS - --batch --host_jvm_args=-Dbazel.DigestFunction=SHA1 + --batch BUCKET istio-artifacts DEFAULT_SLAVE_LABEL diff --git a/jenkins_home/jobs/istio-testing/config.xml b/jenkins_home/jobs/istio-testing/config.xml index 045e92757e9..9d6e601ce64 100644 --- a/jenkins_home/jobs/istio-testing/config.xml +++ b/jenkins_home/jobs/istio-testing/config.xml @@ -1,9 +1,9 @@ - + - + diff --git a/jenkins_home/jobs/istio-testing/jobs/presubmit/config.xml b/jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml similarity index 89% rename from jenkins_home/jobs/istio-testing/jobs/presubmit/config.xml rename to jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml index a7434867b2c..62431afa15c 100644 --- a/jenkins_home/jobs/istio-testing/jobs/presubmit/config.xml +++ b/jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml @@ -1,5 +1,5 @@ - + false @@ -7,12 +7,12 @@ 15 - 30 + 20 -1 -1 - + https://github.com/istio/istio-testing/ @@ -32,6 +32,11 @@ true + + GITHUB_REPO + + istio-testing + @@ -45,7 +50,7 @@ - + H/2 * * * * CRON true @@ -70,8 +75,8 @@ - - + + 2 @@ -87,9 +92,7 @@ false - - - + JenkinsfileTest diff --git a/jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml b/jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml index 004e84d8a9e..d5d603d2baf 100644 --- a/jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml +++ b/jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml @@ -1,5 +1,5 @@ - + false @@ -13,7 +13,7 @@ - + https://github.com/istio/istio-testing/ @@ -24,7 +24,7 @@ - FF_REPO + GITHUB_REPO istio-testing @@ -48,7 +48,7 @@ - + 2 diff --git a/jenkins_home/jobs/istio/config.xml b/jenkins_home/jobs/istio/config.xml deleted file mode 100644 index be2f8b8408b..00000000000 --- a/jenkins_home/jobs/istio/config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - All - false - false - - - - - - - - false - - - - \ No newline at end of file diff --git a/jenkins_home/jobs/manager/jobs/presubmit/config.xml b/jenkins_home/jobs/manager/jobs/presubmit/config.xml index 7bd4b4852f3..350c1aa1011 100644 --- a/jenkins_home/jobs/manager/jobs/presubmit/config.xml +++ b/jenkins_home/jobs/manager/jobs/presubmit/config.xml @@ -1,5 +1,5 @@ - + false @@ -12,7 +12,7 @@ -1 - + https://github.com/istio/manager/ @@ -32,6 +32,11 @@ true + + GITHUB_REPO + + manager + @@ -61,12 +66,17 @@ true + + + ^(?!.*(stable)).*$ + + - - + + 2 diff --git a/jenkins_home/jobs/manager/jobs/proxy-pr/config.xml b/jenkins_home/jobs/manager/jobs/proxy-pr/config.xml new file mode 100644 index 00000000000..f59cd508f71 --- /dev/null +++ b/jenkins_home/jobs/manager/jobs/proxy-pr/config.xml @@ -0,0 +1,96 @@ + + + + + false + + + https://github.com/istio/proxy/ + + + + false + false + + + + + SUBMODULES_UPDATE + + WORKSPACE:PROXY:${GITHUB_PR_HEAD_SHA},WORKSPACE:PROXY_SHA: + + + STAGE + + PRESUBMIT + + + UPDATE_PR + + true + + + GITHUB_REPO + + proxy + + + + + 0 + 0 + + false + project + false + + + + + + * * * * * + CRON + true + false + false + + + true + + + + + .*(Jenkins job proxy/presubmit passed).* + + + true + + + master + + + + + + + + + 2 + + + https://github.com/istio/manager + + + + + stable + + + false + + + + Jenkinsfile + + + \ No newline at end of file diff --git a/jenkins_home/jobs/manager/jobs/update-stable/config.xml b/jenkins_home/jobs/manager/jobs/update-stable/config.xml index ca74c6efbe0..1cafb0873e1 100644 --- a/jenkins_home/jobs/manager/jobs/update-stable/config.xml +++ b/jenkins_home/jobs/manager/jobs/update-stable/config.xml @@ -1,5 +1,5 @@ - + false @@ -20,7 +20,7 @@ - FF_REPO + GITHUB_REPO manager @@ -44,7 +44,7 @@ - + 2 diff --git a/jenkins_home/jobs/mixer/config.xml b/jenkins_home/jobs/mixer/config.xml deleted file mode 100644 index be2f8b8408b..00000000000 --- a/jenkins_home/jobs/mixer/config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - All - false - false - - - - - - - - false - - - - \ No newline at end of file diff --git a/jenkins_home/jobs/proxy/jobs/mixerclient-pr/config.xml b/jenkins_home/jobs/proxy/jobs/mixerclient-pr/config.xml index 4c4c0db2008..f22f8aeef6f 100644 --- a/jenkins_home/jobs/proxy/jobs/mixerclient-pr/config.xml +++ b/jenkins_home/jobs/proxy/jobs/mixerclient-pr/config.xml @@ -1,10 +1,10 @@ - + false - + https://github.com/istio/mixerclient/ @@ -29,6 +29,11 @@ true + + GITHUB_REPO + + mixerclient + @@ -68,7 +73,7 @@ - + 2 diff --git a/jenkins_home/jobs/proxy/jobs/presubmit/config.xml b/jenkins_home/jobs/proxy/jobs/presubmit/config.xml index 37abf122518..500c9fe5b5c 100644 --- a/jenkins_home/jobs/proxy/jobs/presubmit/config.xml +++ b/jenkins_home/jobs/proxy/jobs/presubmit/config.xml @@ -1,5 +1,5 @@ - + false @@ -12,7 +12,7 @@ -1 - + https://github.com/istio/proxy/ @@ -33,14 +33,9 @@ PRESUBMIT - BAZEL_ARGS + GITHUB_REPO - - - - BAZEL_BUILD_ARGS - - + proxy @@ -71,12 +66,17 @@ true + + + ^(?!.*(stable)).*$ + + - - + + 2 diff --git a/jenkins_home/jobs/proxy/jobs/update-stable/config.xml b/jenkins_home/jobs/proxy/jobs/update-stable/config.xml index 858a2fdabb3..4ad7d258acb 100644 --- a/jenkins_home/jobs/proxy/jobs/update-stable/config.xml +++ b/jenkins_home/jobs/proxy/jobs/update-stable/config.xml @@ -1,5 +1,5 @@ - + false @@ -20,7 +20,7 @@ - FF_REPO + GITHUB_REPO proxy @@ -44,7 +44,7 @@ - + 2 diff --git a/jenkins_home/plugins/branch-api.jpi b/jenkins_home/plugins/branch-api.jpi index 61ddbb34454..60949357230 100644 Binary files a/jenkins_home/plugins/branch-api.jpi and b/jenkins_home/plugins/branch-api.jpi differ diff --git a/jenkins_home/plugins/git.jpi b/jenkins_home/plugins/git.jpi index 9e7c6f69228..f9c599f65bd 100644 Binary files a/jenkins_home/plugins/git.jpi and b/jenkins_home/plugins/git.jpi differ diff --git a/jenkins_home/plugins/github-branch-source.jpi b/jenkins_home/plugins/github-branch-source.jpi deleted file mode 100644 index cc96662514b..00000000000 Binary files a/jenkins_home/plugins/github-branch-source.jpi and /dev/null differ diff --git a/jenkins_home/plugins/github.jpi b/jenkins_home/plugins/github.jpi index a48ff000004..186ab932d33 100644 Binary files a/jenkins_home/plugins/github.jpi and b/jenkins_home/plugins/github.jpi differ diff --git a/jenkins_home/plugins/junit.jpi b/jenkins_home/plugins/junit.jpi index 471abba361d..5306d74d96a 100644 Binary files a/jenkins_home/plugins/junit.jpi and b/jenkins_home/plugins/junit.jpi differ diff --git a/jenkins_home/plugins/pipeline-model-api.jpi b/jenkins_home/plugins/pipeline-model-api.jpi index 0917c44c15b..619f52dcc4c 100644 Binary files a/jenkins_home/plugins/pipeline-model-api.jpi and b/jenkins_home/plugins/pipeline-model-api.jpi differ diff --git a/jenkins_home/plugins/pipeline-model-declarative-agent.jpi b/jenkins_home/plugins/pipeline-model-declarative-agent.jpi index 02e48ae2610..e617422768f 100644 Binary files a/jenkins_home/plugins/pipeline-model-declarative-agent.jpi and b/jenkins_home/plugins/pipeline-model-declarative-agent.jpi differ diff --git a/jenkins_home/plugins/pipeline-model-definition.jpi b/jenkins_home/plugins/pipeline-model-definition.jpi index 0422f3d9c9c..1f494b98627 100644 Binary files a/jenkins_home/plugins/pipeline-model-definition.jpi and b/jenkins_home/plugins/pipeline-model-definition.jpi differ diff --git a/jenkins_home/plugins/pipeline-stage-tags-metadata.jpi b/jenkins_home/plugins/pipeline-stage-tags-metadata.jpi index 019ef066e42..05c3758fba0 100644 Binary files a/jenkins_home/plugins/pipeline-stage-tags-metadata.jpi and b/jenkins_home/plugins/pipeline-stage-tags-metadata.jpi differ diff --git a/jenkins_home/plugins/ssh-slaves.jpi b/jenkins_home/plugins/ssh-slaves.jpi deleted file mode 100644 index 4f576eb7c6d..00000000000 Binary files a/jenkins_home/plugins/ssh-slaves.jpi and /dev/null differ diff --git a/jenkins_home/plugins/translation.jpi b/jenkins_home/plugins/translation.jpi deleted file mode 100644 index 87ee95109d4..00000000000 Binary files a/jenkins_home/plugins/translation.jpi and /dev/null differ diff --git a/jenkins_home/plugins/workflow-basic-steps.jpi b/jenkins_home/plugins/workflow-basic-steps.jpi index 5759b6c2718..789b8f171da 100644 Binary files a/jenkins_home/plugins/workflow-basic-steps.jpi and b/jenkins_home/plugins/workflow-basic-steps.jpi differ diff --git a/jenkins_home/plugins/workflow-cps-global-lib.jpi b/jenkins_home/plugins/workflow-cps-global-lib.jpi index 192acae05c5..9af081d41e8 100644 Binary files a/jenkins_home/plugins/workflow-cps-global-lib.jpi and b/jenkins_home/plugins/workflow-cps-global-lib.jpi differ diff --git a/jenkins_home/plugins/workflow-job.jpi b/jenkins_home/plugins/workflow-job.jpi index 21bff426f25..2646afcea7b 100644 Binary files a/jenkins_home/plugins/workflow-job.jpi and b/jenkins_home/plugins/workflow-job.jpi differ diff --git a/jenkins_home/plugins/workflow-step-api.jpi b/jenkins_home/plugins/workflow-step-api.jpi index 401a8e83a8e..1d313120fd3 100644 Binary files a/jenkins_home/plugins/workflow-step-api.jpi and b/jenkins_home/plugins/workflow-step-api.jpi differ diff --git a/jenkins_home/plugins/workflow-support.jpi b/jenkins_home/plugins/workflow-support.jpi index cc8c0e45e95..4d5de0b2d57 100644 Binary files a/jenkins_home/plugins/workflow-support.jpi and b/jenkins_home/plugins/workflow-support.jpi differ