Skip to content

Commit

Permalink
Merge pull request #1183 from smarterclayton/cvo
Browse files Browse the repository at this point in the history
Add cluster version operator job definitions
  • Loading branch information
openshift-merge-robot authored Aug 14, 2018
2 parents 2b1a9ba + 3c8bdf2 commit 0884cc7
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 0 deletions.
46 changes: 46 additions & 0 deletions ci-operator/config/openshift/cluster-version-operator/master.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"tag_specification": {
"cluster": "https://api.ci.openshift.org",
"namespace": "openshift",
"name": "origin-v3.11",
"tag": "",
"tag_overrides": {}
},
"base_images": {
"base": {
"cluster": "https://api.ci.openshift.org",
"namespace": "openshift",
"name": "origin-v3.11",
"tag": "base"
}
},
"test_base_image": {
"cluster": "https://api.ci.openshift.org",
"namespace": "openshift",
"name": "release",
"tag": "golang-1.10"
},
"canonical_go_repository": "github.com/openshift/cluster-version-operator",

"images": [
{
"from": "base",
"to": "cluster-version-operator"
}
],

"tests": [
{
"as": "unit",
"from": "src",
"commands": "go test ./..."
}
],

"resources": {
"*": {
"requests": { "cpu": "100m", "memory": "200Mi" },
"limits": { "cpu": "2", "memory": "4Gi" }
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
postsubmits:
openshift/cluster-monitoring-operator:
- name: branch-ci-openshift-cluster-version-operator-images
agent: kubernetes
labels:
artifacts: images
branches:
- master
decorate: true
skip_cloning: true
spec:
serviceAccountName: ci-operator
containers:
- name: test
image: ci-operator:latest
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
name: ci-operator-openshift-cluster-version-operator
key: master.json
command:
- ci-operator
args:
- --artifact-dir=$(ARTIFACTS)
- --target=[images]
- --promote
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
presubmits:
openshift/cluster-capacity:
- name: pull-ci-openshift-cluster-version-operator-unit
agent: kubernetes
context: ci/prow/unit
branches:
- master
rerun_command: "/test unit"
always_run: true
trigger: "((?m)^/test( all| unit),?(\\s+|$))"
decorate: true
skip_cloning: true
spec:
serviceAccountName: ci-operator
containers:
- name: test
image: ci-operator:latest
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
name: ci-operator-openshift-cluster-version-operator
key: master.json
command:
- ci-operator
args:
- --artifact-dir=$(ARTIFACTS)
- --target=unit
- --target=[images]
1 change: 1 addition & 0 deletions cluster/ci/config/prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ tide:
- openshift/telemeter
- openshift/service-serving-cert-signer
- openshift/service-catalog
- openshift/cluster-version-operator
labels:
- lgtm
missingLabels:
Expand Down
2 changes: 2 additions & 0 deletions cluster/ci/config/prow/plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ config_updater:
name: ci-operator-openshift-origin
ci-operator/config/openshift/installer/master.json:
name: ci-operator-openshift-installer
ci-operator/config/openshift/cluster-version-operator/master.json:
name: ci-operator-openshift-cluster-version-operator
ci-operator/config/openshift/origin-web-console-server/master.json:
name: ci-operator-openshift-origin-web-console-server
ci-operator/config/openshift/origin-web-console-server/release-3.10.json:
Expand Down

0 comments on commit 0884cc7

Please sign in to comment.