Skip to content
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
19 changes: 19 additions & 0 deletions ci-operator/config/openshift/installer/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ base_images:
name: origin-v4.0
namespace: openshift
tag: base
base-smoke:
cluster: https://api.ci.openshift.org
namespace: openshift
name: origin-release
tag: bazel
binary_build_commands: go build ./installer/cmd/tectonic
canonical_go_repository: github.com/openshift/installer
images:
Expand All @@ -18,6 +23,20 @@ images:
as:
- build
to: installer
- dockerfile_path: images/tectonic-installer/Dockerfile.ci
from: base-smoke
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/installer/tectonic
root:
as:
- build
to: installer-bazel
- dockerfile_path: images/installer-origin-release/Dockerfile.ci
from: installer-bazel
to: installer-smoke
resources:
'*':
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,62 @@ presubmits:
- configMap:
name: cluster-profile-aws
trigger: ((?m)^/test( all| e2e-aws),?(\s+|$))
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/e2e-aws-smoke
decorate: true
name: pull-ci-origin-installer-e2e-aws-smoke
rerun_command: /test e2e-aws-smoke
# The abomination below is equivalent to `^((?!Documentation).)*$`. Since
# Go doesn't support negative lookaheads, we are stuck with the following.
run_if_changed: ^([^D]|D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*([^Do]|o[^Dc]|oc[^Du]|ocu[^Dm]|ocum([^De]|e([^Dn]|n([^Dt]|t([^Da]|a[^Dt]|at[^Di]|ati[^Do]|atio[^Dn]))))))*(D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*(o|oc|ocu|ocum(e(n(t(a|at|ati|atio)?)?)?)?)?)?$
skip_cloning: true
spec:
containers:
- command:
- ci-operator
- --artifact-dir=$(ARTIFACTS)
- --secret-dir=/usr/local/e2e-aws-smoke-cluster-profile
- --template=/usr/local/e2e-aws-smoke
- --target=e2e-aws-smoke
env:
- name: JOB_NAME_SAFE
value: e2e-aws-smoke
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: master.json
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be changed to master.yaml.

We have mass-renamed all ci-operator configuration files from .json to .yaml in #1336, because YAML is what ci-operator consumes now. All the references of these files needed to be changed too. JSON is a YAML subset so that the actual file content can stay like it is (we'll eventually mass-reformat them to the block style).

Copy link
Contributor Author

@sallyom sallyom Sep 10, 2018

Choose a reason for hiding this comment

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

rebased, thanks-will push in a few

Copy link
Contributor Author

Choose a reason for hiding this comment

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

and rebased against block style, too lol

name: ci-operator-openshift-installer
image: ci-operator:latest
name: test
resources:
limits:
cpu: 500m
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-smoke
name: job-definition
subPath: cluster-launch-installer-e2e-smoke.yaml
- mountPath: /usr/local/e2e-aws-smoke-cluster-profile
name: cluster-profile
serviceAccountName: ci-operator
volumes:
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: cluster-profile-aws
trigger: ((?m)^/test( all| e2e-aws-smoke),?(\s+|$))
- agent: kubernetes
always_run: false
branches:
Expand Down
Loading