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

add rpm tooling to bazelbuild image #5461

Merged
merged 2 commits into from
Nov 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions images/bazelbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
git \
python \
python-pip \
rpm \
unzip \
wget \
zip \
Expand Down
66 changes: 33 additions & 33 deletions prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ presubmits:
trigger: "(?m)^/test( all| pull-federation-bazel-test),?(\\s+|$)"
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -288,7 +288,7 @@ presubmits:
trigger: "(?m)^/test( all| pull-cluster-registry-bazel),?(\\s+|$)"
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -419,7 +419,7 @@ presubmits:
- release-1.8 # different target set
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -522,7 +522,7 @@ presubmits:
- release-1.8
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -623,7 +623,7 @@ presubmits:
- release-1.6
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -775,7 +775,7 @@ presubmits:
- release-1.8 # different set of targets
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -825,7 +825,7 @@ presubmits:
- release-1.8
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -873,7 +873,7 @@ presubmits:
- release-1.6
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -1709,7 +1709,7 @@ presubmits:
- release-1.8 # different target set
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -1812,7 +1812,7 @@ presubmits:
- release-1.8
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -1913,7 +1913,7 @@ presubmits:
- release-1.6
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -2063,7 +2063,7 @@ presubmits:
- release-1.8 # different set of targets
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -2113,7 +2113,7 @@ presubmits:
- release-1.8
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -2161,7 +2161,7 @@ presubmits:
- release-1.6
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -2993,7 +2993,7 @@ presubmits:
trigger: "(?m)^/test( all| pull-test-infra-bazel),?(\\s+|$)"
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171020-844b54d7-0.7.0
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.7.0
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3259,7 +3259,7 @@ postsubmits:
- master
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3300,7 +3300,7 @@ postsubmits:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3345,7 +3345,7 @@ postsubmits:
- release-1.6
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3383,7 +3383,7 @@ postsubmits:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3465,7 +3465,7 @@ postsubmits:
- release-1.7
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3505,7 +3505,7 @@ postsubmits:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3675,7 +3675,7 @@ postsubmits:
- release-1.8
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3715,7 +3715,7 @@ postsubmits:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3843,7 +3843,7 @@ postsubmits:
- master
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171020-844b54d7-0.7.0
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.7.0
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -3923,7 +3923,7 @@ postsubmits:
- master
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -4183,7 +4183,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18251,7 +18251,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171020-844b54d7-0.7.0
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.7.0
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18443,7 +18443,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18481,7 +18481,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.5.2 # https://github.com/kubernetes/kubernetes/issues/51571
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18564,7 +18564,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18604,7 +18604,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18732,7 +18732,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down Expand Up @@ -18772,7 +18772,7 @@ periodics:
agent: kubernetes
spec:
containers:
- image: gcr.io/k8s-testimages/bazelbuild:v20171013-53473ec5-0.6.1
- image: gcr.io/k8s-testimages/bazelbuild:v20171113-ae73dc58-0.6.1
args:
- "--clean"
- "--git-cache=/root/.cache/git"
Expand Down
5 changes: 3 additions & 2 deletions prow/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,9 @@ func TestBazelbuildArgs(t *testing.T) {
}
pinnedJobs := map[string]string{
//job: reason for pinning
"pull-test-infra-bazel": "test-infra adopts bazel upgrades first",
"ci-test-infra-bazel": "test-infra adopts bazel upgrades first",
// these frequently need to be pinned...
Copy link
Member Author

Choose a reason for hiding this comment

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

we might want to consider updating the presubmit to allow jobs to remain in the pinned whitelist even if they are not current considered pinned, these jobs are repeatedly pinned / unpinned since we dogfood bazel upgrades on test-infra first.

//"pull-test-infra-bazel": "test-infra adopts bazel upgrades first",
//"ci-test-infra-bazel": "test-infra adopts bazel upgrades first",
"pull-test-infra-bazel-canary": "canary testing the latest bazel",
"pull-kubernetes-bazel-build-canary": "canary testing the latest bazel",
"pull-kubernetes-bazel-test-canary": "canary testing the latest bazel",
Expand Down