Skip to content

Commit

Permalink
migrate charts to its own config file
Browse files Browse the repository at this point in the history
  • Loading branch information
krzyzacy committed Jul 17, 2018
1 parent 68c6868 commit edc54aa
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 69 deletions.
2 changes: 2 additions & 0 deletions config/jobs/kubernetes/charts/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
approvers:
- foxish
55 changes: 55 additions & 0 deletions config/jobs/kubernetes/charts/charts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
presubmits:
kubernetes/charts:
- name: pull-charts-e2e
agent: kubernetes
always_run: true
context: pull-charts-e2e
rerun_command: "/test pull-charts-e2e"
trigger: "(?m)^/test( all| pull-charts-e2e),?(\\s+|$)"
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20180716-9145034c9-master
args:
- "--repo=k8s.io/charts=$(PULL_REFS)"
- "--root=/go/src/"
- "--upload=gs://kubernetes-jenkins/pr-logs"
env:
- name: DOCKER_IN_DOCKER_ENABLED
value: "true"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
volumeMounts:
- name: docker-graph
mountPath: /docker-graph
volumes:
- name: docker-graph
emptyDir: {}

periodics:
- interval: 1h
agent: kubernetes
name: ci-kubernetes-charts-gce
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=200
- --repo=k8s.io/charts
- --root=/go/src
- --scenario=kubernetes_e2e
- --
- --charts
- --check-leaked-resources
- --extract=ci/latest
- --gcp-node-image=gci
- --gcp-zone=us-central1-f
- --provider=gce
- --test=false
- --timeout=180m
image: gcr.io/k8s-testimages/kubekins-e2e:v20180716-9145034c9-master
25 changes: 0 additions & 25 deletions jobs/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1041,22 +1041,6 @@
"sig-release"
]
},
"ci-kubernetes-charts-gce": {
"args": [
"--charts",
"--check-leaked-resources",
"--extract=ci/latest",
"--gcp-node-image=gci",
"--gcp-zone=us-central1-f",
"--provider=gce",
"--test=false",
"--timeout=180m"
],
"scenario": "kubernetes_e2e",
"sigOwners": [
"sig-apps"
]
},
"ci-kubernetes-cross-build": {
"args": [
"--hyperkube",
Expand Down Expand Up @@ -6189,15 +6173,6 @@
"sig-cluster-lifecycle"
]
},
"pull-charts-e2e": {
"args": [
"./test/e2e.sh"
],
"scenario": "execute",
"sigOwners": [
"sig-apps"
]
},
"pull-cloud-provider-azure-check": {
"args": [
"make",
Expand Down
44 changes: 0 additions & 44 deletions prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -406,36 +406,6 @@ presets:
readOnly: true

presubmits:
kubernetes/charts:
- name: pull-charts-e2e
agent: kubernetes
always_run: true
context: pull-charts-e2e
rerun_command: "/test pull-charts-e2e"
trigger: "(?m)^/test( all| pull-charts-e2e),?(\\s+|$)"
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20180716-9145034c9-master
args:
- "--repo=k8s.io/charts=$(PULL_REFS)"
- "--root=/go/src/"
- "--upload=gs://kubernetes-jenkins/pr-logs"
env:
- name: DOCKER_IN_DOCKER_ENABLED
value: "true"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
volumeMounts:
- name: docker-graph
mountPath: /docker-graph
volumes:
- name: docker-graph
emptyDir: {}

kubernetes/cloud-provider-azure:
- name: pull-cloud-provider-azure-check
agent: kubernetes
Expand Down Expand Up @@ -4817,20 +4787,6 @@ periodics:
- name: docker-graph
emptyDir: {}

- interval: 1h
agent: kubernetes
name: ci-kubernetes-charts-gce
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
spec:
containers:
- args:
- --timeout=200
- --repo=k8s.io/charts
- --root=/go/src
image: gcr.io/k8s-testimages/kubekins-e2e:v20180716-9145034c9-master

- interval: 1h
name: ci-kubernetes-cross-build
agent: kubernetes
Expand Down

0 comments on commit edc54aa

Please sign in to comment.