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.

Sign up for GitHub

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

Jump to bottom

Set up update-jenkins-jobs on PR Jenkins. #22473

Merged
merged 1 commit into from
Mar 4, 2016
Merged

Set up update-jenkins-jobs on PR Jenkins. #22473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions hack/jenkins/job-configs/kubernetes-jenkins-pull/kubernetes-update-jenkins-jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have email-ext installed/set up on PR Jenkins?

recipients: spxtr@google.com

0 ...jenkins/job-configs/kubernetes-build.yaml → .../kubernetes-jenkins/kubernetes-build.yaml
View file
Open in desktop
File renamed without changes.
0 .../kubernetes-e2e-gce-enormous-startup.yaml → .../kubernetes-e2e-gce-enormous-startup.yaml
View file
Open in desktop
File renamed without changes.
0 hack/jenkins/job-configs/kubernetes-e2e.yaml → ...gs/kubernetes-jenkins/kubernetes-e2e.yaml
View file
Open in desktop
File renamed without changes.
0 ...kins/job-configs/kubernetes-kubemark.yaml → ...bernetes-jenkins/kubernetes-kubemark.yaml
View file
Open in desktop
File renamed without changes.
0 .../jenkins/job-configs/kubernetes-soak.yaml → ...s/kubernetes-jenkins/kubernetes-soak.yaml
View file
Open in desktop
File renamed without changes.
0 ...nkins/job-configs/kubernetes-test-go.yaml → ...ubernetes-jenkins/kubernetes-test-go.yaml
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion ...nfigs/kubernetes-update-jenkins-jobs.yaml → ...nkins/kubernetes-update-jenkins-jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't it fail to update itself, since it now requires the config dir to be set?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct about that. The annoying thing is that Jenkins doesn't let me view that job or change its config once it has broken.

I'll just POST the new config manually, I suppose.

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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how does this work? previously it was just a directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JJB lets you join directories as in your PATH variable. I just put global stuff in job-configs, the rest is in one of the other two folders depending on which Jenkins instance to run it in.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, OK. at first this reminded me of a docker mount, which is why I was confused. not sure if there's a way to make that more obvious.

publishers:
- email-ext:
recipients: spxtr@google.com
Expand Down
0 ...kins/job-configs/kubernetes-upgrades.yaml → ...bernetes-jenkins/kubernetes-upgrades.yaml
View file
Open in desktop
File renamed without changes.
0 hack/jenkins/job-configs/node-e2e.yaml → ...-configs/kubernetes-jenkins/node-e2e.yaml
View file
Open in desktop
File renamed without changes.
0 ...jenkins/job-configs/test-linkchecker.yaml → .../kubernetes-jenkins/test-linkchecker.yaml
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions hack/jenkins/update-jobs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <dir>" >&2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to update comment on L17-18

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

exit 1
fi

# Run the container if it isn't present.
Expand Down