diff --git a/jenkins_home/config.xml b/jenkins_home/config.xml
index 44d8ed56dc6..eb8db0abc46 100644
--- a/jenkins_home/config.xml
+++ b/jenkins_home/config.xml
@@ -5,7 +5,7 @@
jenkins.security.s2m.MasterKillSwitchWarning
2.32.2
- 10
+ 7
EXCLUSIVE
true
@@ -57,7 +57,7 @@
ubuntu-16-04
false
false
- 20
+ 10
0
@@ -75,7 +75,7 @@
/home/jenkins
${computer.jnlpmac} ${computer.name}
- false
+ true
500m
512Mi
2000m
@@ -120,7 +120,7 @@
/home/jenkins
${computer.jnlpmac} ${computer.name}
- false
+ true
500m
512Mi
4000m
@@ -183,9 +183,8 @@
jenkins
http://jenkins-ui.jenkins.svc.cluster.local:8080
jenkins-discovery.jenkins.svc.cluster.local:50000
- jenkins
- 30
- 5
+ 20
+ 20
0
0
diff --git a/jenkins_home/credentials.xml b/jenkins_home/credentials.xml
index 3261ab56d0d..cd711f7b739 100644
--- a/jenkins_home/credentials.xml
+++ b/jenkins_home/credentials.xml
@@ -1,23 +1,23 @@
-
+
-
+
GLOBAL
jenkins
jenkins
-
+
GLOBAL
istio-testing
Istio Testing Jenkins
{AQAAABAAAAAwf+ymSMBqyx4qkUNcyDwbUwPkrTARMzVHGPA/ZpAwXAo42fuJW+xCusCZ3oF6SpUyCyF04LDHdxhOTY1qQdwkPA==}
-
+
GLOBAL
MANAGER_CODECOV_TOKEN
Repository Upload Token for https://codecov.io/gh/istio/manager
@@ -30,6 +30,12 @@
istiotesting
{AQAAABAAAAAwGetPp4QyLCCJ/fPSj6+CFdC/zV+W+qMvA5+TtQL44/fMpPRyqX972S313lzN5iHHRbsz3Z9x6Ng01wxfBgzMOw==}
+
+ GLOBAL
+ MIXER_CODECOV_TOKEN
+ Codecov for Mixer
+ {AQAAABAAAAAwodQnLGkcRYb25vO24oteC8KC2vhGKeWA+uoaLPkrbhn4yQmZekvJhxrG0IpMeV2BbKjV7UmafAwGohhXS9+R9A==}
+
diff --git a/jenkins_home/github-plugin-configuration.xml b/jenkins_home/github-plugin-configuration.xml
index 02a173051f6..55faf12282c 100644
--- a/jenkins_home/github-plugin-configuration.xml
+++ b/jenkins_home/github-plugin-configuration.xml
@@ -1,9 +1,9 @@
-
+
https://api.github.com
- false
+ true
istio-testing
20
diff --git a/jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml b/jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml
index 33b72e5afdf..c04d4571ec3 100644
--- a/jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml
+++ b/jenkins_home/jobs/istio-testing/jobs/pr-master/config.xml
@@ -12,7 +12,7 @@
-1
-
+
https://github.com/istio/istio-testing/
diff --git a/jenkins_home/jobs/istio-testing/jobs/pr-stable/config.xml b/jenkins_home/jobs/istio-testing/jobs/pr-stable/config.xml
new file mode 100644
index 00000000000..7623061d9c8
--- /dev/null
+++ b/jenkins_home/jobs/istio-testing/jobs/pr-stable/config.xml
@@ -0,0 +1,111 @@
+
+
+
+
+ false
+
+
+
+ 15
+ 20
+ -1
+ -1
+
+
+
+ https://github.com/istio/istio-testing/
+
+
+
+ false
+ false
+
+
+
+
+ STAGE
+
+ _SLAVE_UPDATE
+
+
+ UPDATE_PR
+
+ true
+
+
+ GITHUB_REPO
+
+ istio-testing
+
+
+
+
+ 0
+ 3
+
+ true
+ project
+ false
+
+
+
+
+
+ H/5 * * * *
+ HEAVY_HOOKS
+ true
+ false
+ false
+
+
+ true
+
+
+
+ GitHub Pull Requests Trigger Errors
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ stable
+
+
+
+
+
+
+
+
+ 2
+
+
+ origin-pull
+ +refs/pull/${GITHUB_PR_NUMBER}/head:refs/remotes/origin-pull/pull/${GITHUB_PR_NUMBER}/head
+ https://github.com/istio/istio-testing
+
+
+
+
+ origin-pull/pull/${GITHUB_PR_NUMBER}/head
+
+
+ false
+
+
+
+ Jenkinsfile
+
+
+
\ No newline at end of file
diff --git a/jenkins_home/jobs/istio-testing/jobs/ubuntu-16-04-slave/config.xml b/jenkins_home/jobs/istio-testing/jobs/ubuntu-16-04-slave/config.xml
index 98e50e372ae..30d31553199 100644
--- a/jenkins_home/jobs/istio-testing/jobs/ubuntu-16-04-slave/config.xml
+++ b/jenkins_home/jobs/istio-testing/jobs/ubuntu-16-04-slave/config.xml
@@ -1,5 +1,5 @@
-
+
false
@@ -13,7 +13,7 @@
-
+
https://github.com/istio/istio-testing/
@@ -26,7 +26,7 @@
BRANCH_SPEC
- master
+ stable
STAGE
@@ -57,8 +57,8 @@
-
-
+
+
2
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 d5d603d2baf..c9005ec761b 100644
--- a/jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml
+++ b/jenkins_home/jobs/istio-testing/jobs/update-stable/config.xml
@@ -13,7 +13,7 @@
-
+
https://github.com/istio/istio-testing/
@@ -24,9 +24,9 @@
- GITHUB_REPO
+ GITHUB_REPOS
- istio-testing
+ istio-testing,mixer,proxy,manager
@@ -47,7 +47,7 @@
-
+
2
diff --git a/jenkins_home/jobs/manager/config.xml b/jenkins_home/jobs/manager/config.xml
index 9d6e601ce64..509193a0a9d 100644
--- a/jenkins_home/jobs/manager/config.xml
+++ b/jenkins_home/jobs/manager/config.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/jenkins_home/jobs/manager/jobs/postsubmit/config.xml b/jenkins_home/jobs/manager/jobs/postsubmit/config.xml
index f328375f6c2..5d9a262fc67 100644
--- a/jenkins_home/jobs/manager/jobs/postsubmit/config.xml
+++ b/jenkins_home/jobs/manager/jobs/postsubmit/config.xml
@@ -13,7 +13,7 @@
-
+
https://github.com/istio/manager/
@@ -32,9 +32,13 @@
-
+
+
+ H/2 * * * *
+ false
+
diff --git a/jenkins_home/jobs/mixer/config.xml b/jenkins_home/jobs/mixer/config.xml
new file mode 100644
index 00000000000..509193a0a9d
--- /dev/null
+++ b/jenkins_home/jobs/mixer/config.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ All
+ false
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
\ No newline at end of file
diff --git a/jenkins_home/jobs/manager/jobs/update-stable/config.xml b/jenkins_home/jobs/mixer/jobs/postsubmit/config.xml
similarity index 72%
rename from jenkins_home/jobs/manager/jobs/update-stable/config.xml
rename to jenkins_home/jobs/mixer/jobs/postsubmit/config.xml
index 1cafb0873e1..1b986c25934 100644
--- a/jenkins_home/jobs/manager/jobs/update-stable/config.xml
+++ b/jenkins_home/jobs/mixer/jobs/postsubmit/config.xml
@@ -6,26 +6,21 @@
- 15
- 30
+ 20
+ 10
-1
-1
+
+ https://github.com/istio/mixer/
+
+
false
false
-
-
-
- GITHUB_REPO
-
- manager
-
-
-
0
0
@@ -37,30 +32,34 @@
-
- H * * * *
-
+
+
+
+
+ H/2 * * * *
+ false
+
-
+
2
- https://github.com/istio/istio-testing
+ https://github.com/istio/mixer
- stable
+ */master
false
- fastForward.groovy
+ Jenkinsfile
\ No newline at end of file
diff --git a/jenkins_home/jobs/mixer/jobs/presubmit/config.xml b/jenkins_home/jobs/mixer/jobs/presubmit/config.xml
new file mode 100644
index 00000000000..1180b7101a8
--- /dev/null
+++ b/jenkins_home/jobs/mixer/jobs/presubmit/config.xml
@@ -0,0 +1,111 @@
+
+
+
+
+ false
+
+
+
+ 20
+ 10
+ -1
+ -1
+
+
+
+ https://github.com/istio/mixer/
+
+
+
+ false
+ false
+
+
+
+
+ STAGE
+
+ PRESUBMIT
+
+
+ GITHUB_REPO
+
+ mixer
+
+
+ UPDATE_PR
+
+ true
+
+
+
+
+ 0
+ 3
+
+ true
+ project
+ false
+
+
+
+
+
+ H/5 * * * *
+ HEAVY_HOOKS
+ true
+ false
+ false
+
+
+ true
+
+
+
+ GitHub Pull Requests Trigger Errors
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ ^(?!.*(stable)).*$
+
+
+
+
+
+
+
+
+ 2
+
+
+ origin-pull
+ +refs/pull/${GITHUB_PR_NUMBER}/head:refs/remotes/origin-pull/pull/${GITHUB_PR_NUMBER}/head
+ https://github.com/istio/mixer
+
+
+
+
+ origin-pull/pull/${GITHUB_PR_NUMBER}/head
+
+
+ false
+
+
+
+ Jenkinsfile
+
+
+
\ No newline at end of file
diff --git a/jenkins_home/jobs/proxy/config.xml b/jenkins_home/jobs/proxy/config.xml
index 538815e282c..509193a0a9d 100644
--- a/jenkins_home/jobs/proxy/config.xml
+++ b/jenkins_home/jobs/proxy/config.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/jenkins_home/jobs/proxy/jobs/postsubmit/config.xml b/jenkins_home/jobs/proxy/jobs/postsubmit/config.xml
index ba8683cbaba..9ce54c716a1 100644
--- a/jenkins_home/jobs/proxy/jobs/postsubmit/config.xml
+++ b/jenkins_home/jobs/proxy/jobs/postsubmit/config.xml
@@ -12,7 +12,7 @@
-1
-
+
https://github.com/istio/proxy/
@@ -40,9 +40,13 @@
-
+
+
+ H/2 * * * *
+ false
+
diff --git a/jenkins_home/jobs/proxy/jobs/update-stable/config.xml b/jenkins_home/jobs/proxy/jobs/update-stable/config.xml
deleted file mode 100644
index 4ad7d258acb..00000000000
--- a/jenkins_home/jobs/proxy/jobs/update-stable/config.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
- false
-
-
-
- 15
- 30
- -1
- -1
-
-
-
-
- false
- false
-
-
-
-
- GITHUB_REPO
-
- proxy
-
-
-
-
- 0
- 0
-
- false
- project
- false
-
-
-
-
-
- H * * * *
-
-
-
-
-
-
- 2
-
-
- https://github.com/istio/istio-testing
-
-
-
-
- stable
-
-
- false
-
-
-
- fastForward.groovy
-
-
-
\ No newline at end of file
diff --git a/jenkins_home/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml b/jenkins_home/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml
index 3631c709996..6df03a85c01 100644
--- a/jenkins_home/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml
+++ b/jenkins_home/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml
@@ -1,7 +1,7 @@
- proxy/presubmit
- 137
+ mixer/postsubmit
+ 4
\ No newline at end of file
diff --git a/jenkins_home/plugins/github.jpi b/jenkins_home/plugins/github.jpi
index 186ab932d33..296e5bd65be 100644
Binary files a/jenkins_home/plugins/github.jpi and b/jenkins_home/plugins/github.jpi differ
diff --git a/jenkins_home/scriptApproval.xml b/jenkins_home/scriptApproval.xml
index 7c7e63cab09..2500c087422 100644
--- a/jenkins_home/scriptApproval.xml
+++ b/jenkins_home/scriptApproval.xml
@@ -1,18 +1,10 @@
-
+
-
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods get java.util.Map java.lang.Object java.lang.Object
-
+
-
-
-
- method groovy.lang.GroovyObject invokeMethod java.lang.String java.lang.Object
- true
-
-
+
\ No newline at end of file
diff --git a/resources/release-docker b/resources/release-docker
index f6aaf7652d2..be9a1fb2272 100755
--- a/resources/release-docker
+++ b/resources/release-docker
@@ -40,7 +40,7 @@ fi
set -ex
for IMAGE in "${IMAGES[@]}"; do
- bazel ${BAZEL_STARTUP_ARGS} run ${BAZEL_ARGS} "//docker:${IMAGE}"
+ bazel ${BAZEL_STARTUP_ARGS} run ${BAZEL_ARGS} "//docker:${IMAGE}" istio/docker:"${IMAGE}"
for TAG in "${TAGS[@]}"; do
docker tag istio/docker:"${IMAGE}" "${HUB}/${IMAGE}:${TAG}"
docker push "${HUB}/${IMAGE}:${TAG}"
diff --git a/scripts/backup_jenkins_home b/scripts/backup_jenkins_home
index 3030557c53d..ea551b2c81a 100755
--- a/scripts/backup_jenkins_home
+++ b/scripts/backup_jenkins_home
@@ -8,8 +8,9 @@ export DEBIAN_FRONTEND=noninteractive
NAMESPACE='jenkins'
APP='master'
+BUCKET='gs://istio-tools/jenkins-secrets'
-BASH_SCRIPT='''BACKUP_FILES="$(find /var/jenkins_home \
+BACKUP_HOME='''BACKUP_FILES="$(find /var/jenkins_home \
\( -not -path "/var/jenkins_home/*/*" -and \
-wholename "/var/jenkins_home/*.xml" \) -o \
\( -wholename "/var/jenkins_home/jobs/*/config.xml" \
@@ -18,6 +19,17 @@ BASH_SCRIPT='''BACKUP_FILES="$(find /var/jenkins_home \
tar czf - ${BACKUP_FILES}'''
+BACKUP_SECRETS='''BACKUP_FILES="$(find /var/jenkins_home \
+ -wholename "/var/jenkins_home/secrets/*")"
+
+tar czf - ${BACKUP_FILES}'''
+
+GIT_FILES="$(git status -s)"
+[[ -z "${GIT_FILES}" ]] \
+ || error_exit "You have modified files. Please commit or reset your workspace."
+
+rm -rf jenkins_home/*
+
POD_NAME="$(kubectl get pods \
--selector=app="${APP}" \
-n "${NAMESPACE}" \
@@ -25,6 +37,14 @@ POD_NAME="$(kubectl get pods \
echo "Getting backup data from pod ${POD_NAME} in ns ${NAMESPACE}"
-kubectl exec "${POD_NAME}" -n "${NAMESPACE}" -- /bin/bash -c "${BASH_SCRIPT}" \
+kubectl exec "${POD_NAME}" -n "${NAMESPACE}" -- /bin/bash -c "${BACKUP_HOME}" \
| tar zxvf - --strip-components 2 -C "${ROOT}/jenkins_home"
+git add .
+git commit -m "Backup Jenkins Home"
+
+COMMIT="$(git rev-parse --verify HEAD)"
+ARCHIVE="${BUCKET}/secrets-${COMMIT}.tar.gz"
+
+kubectl exec "${POD_NAME}" -n "${NAMESPACE}" -- /bin/bash -c "${BACKUP_SECRETS}" \
+ | gsutil cp - "${ARCHIVE}"