From 02fb7b89c35c803cc8348a16d8c2378f26bb3e79 Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Thu, 3 Mar 2016 15:14:07 -0800 Subject: [PATCH] Set up update-jenkins-jobs on PR Jenkins. --- .../kubernetes-update-jenkins-jobs.yaml | 14 ++++++++++++++ .../{ => kubernetes-jenkins}/kubernetes-build.yaml | 0 .../kubernetes-e2e-gce-enormous-startup.yaml | 0 .../{ => kubernetes-jenkins}/kubernetes-e2e.yaml | 0 .../kubernetes-kubemark.yaml | 0 .../{ => kubernetes-jenkins}/kubernetes-soak.yaml | 0 .../kubernetes-test-go.yaml | 0 .../kubernetes-update-jenkins-jobs.yaml | 5 ++++- .../kubernetes-upgrades.yaml | 0 .../{ => kubernetes-jenkins}/node-e2e.yaml | 0 .../{ => kubernetes-jenkins}/test-linkchecker.yaml | 0 hack/jenkins/update-jobs.sh | 7 ++++--- 12 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 hack/jenkins/job-configs/kubernetes-jenkins-pull/kubernetes-update-jenkins-jobs.yaml rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-build.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-e2e-gce-enormous-startup.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-e2e.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-kubemark.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-soak.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-test-go.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-update-jenkins-jobs.yaml (54%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/kubernetes-upgrades.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/node-e2e.yaml (100%) rename hack/jenkins/job-configs/{ => kubernetes-jenkins}/test-linkchecker.yaml (100%) diff --git a/hack/jenkins/job-configs/kubernetes-jenkins-pull/kubernetes-update-jenkins-jobs.yaml b/hack/jenkins/job-configs/kubernetes-jenkins-pull/kubernetes-update-jenkins-jobs.yaml new file mode 100644 index 00000000000..b07e0c30dbc --- /dev/null +++ b/hack/jenkins/job-configs/kubernetes-jenkins-pull/kubernetes-update-jenkins-jobs.yaml @@ -0,0 +1,14 @@ +- job: + name: kubernetes-update-jenkins-jobs + description: 'Update Jenkins jobs based on configs in https://github.com/kubernetes/kubernetes/tree/master/hack/jenkins/job-configs. Test owner: spxtr.' + triggers: + - timed: 'H/15 * * * *' + builders: + - shell: | + curl -fsS https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/update-jobs.sh > update-jobs.sh + chmod +x update-jobs.sh + ./update-jobs.sh "hack/jenkins/job-configs:hack/jenkins/job-configs/kubernetes-jenkins-pull" + publishers: + - email-ext: + recipients: spxtr@google.com + diff --git a/hack/jenkins/job-configs/kubernetes-build.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-build.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-build.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-build.yaml diff --git a/hack/jenkins/job-configs/kubernetes-e2e-gce-enormous-startup.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce-enormous-startup.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-e2e-gce-enormous-startup.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce-enormous-startup.yaml diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-e2e.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml diff --git a/hack/jenkins/job-configs/kubernetes-kubemark.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-kubemark.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-kubemark.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-kubemark.yaml diff --git a/hack/jenkins/job-configs/kubernetes-soak.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-soak.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-soak.yaml diff --git a/hack/jenkins/job-configs/kubernetes-test-go.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-test-go.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-test-go.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-test-go.yaml diff --git a/hack/jenkins/job-configs/kubernetes-update-jenkins-jobs.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-update-jenkins-jobs.yaml similarity index 54% rename from hack/jenkins/job-configs/kubernetes-update-jenkins-jobs.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-update-jenkins-jobs.yaml index 79a9eb9d96f..481eb3ce0d6 100644 --- a/hack/jenkins/job-configs/kubernetes-update-jenkins-jobs.yaml +++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-update-jenkins-jobs.yaml @@ -4,7 +4,10 @@ triggers: - timed: 'H/15 * * * *' builders: - - shell: 'curl -fsS https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/update-jobs.sh | /bin/bash -' + - shell: | + curl -fsS https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/update-jobs.sh > update-jobs.sh + chmod +x update-jobs.sh + ./update-jobs.sh "hack/jenkins/job-configs:hack/jenkins/job-configs/kubernetes-jenkins" publishers: - email-ext: recipients: spxtr@google.com diff --git a/hack/jenkins/job-configs/kubernetes-upgrades.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-upgrades.yaml similarity index 100% rename from hack/jenkins/job-configs/kubernetes-upgrades.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-upgrades.yaml diff --git a/hack/jenkins/job-configs/node-e2e.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/node-e2e.yaml similarity index 100% rename from hack/jenkins/job-configs/node-e2e.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/node-e2e.yaml diff --git a/hack/jenkins/job-configs/test-linkchecker.yaml b/hack/jenkins/job-configs/kubernetes-jenkins/test-linkchecker.yaml similarity index 100% rename from hack/jenkins/job-configs/test-linkchecker.yaml rename to hack/jenkins/job-configs/kubernetes-jenkins/test-linkchecker.yaml diff --git a/hack/jenkins/update-jobs.sh b/hack/jenkins/update-jobs.sh index 6fdbafb2d46..5adf23ba361 100755 --- a/hack/jenkins/update-jobs.sh +++ b/hack/jenkins/update-jobs.sh @@ -14,13 +14,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Update all Jenkins jobs in a folder. If no folder is provided in $1, -# defaults to hack/jenkins/job-configs. +# Update all Jenkins jobs in a folder specified in $1. It can be the union of +# multiple folders separated with a colon, like with the PATH variable. if [[ $# -eq 1 ]]; then config_dir=$1 else - config_dir="hack/jenkins/job-configs" + echo "Usage: $0 " >&2 + exit 1 fi # Run the container if it isn't present.