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
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ prow-secrets:
oc create secret generic repo-management-token --from-literal=oauth=${REPO_MANAGEMENT_TOKEN} -o yaml --dry-run | oc apply -f -
# gce.json is used by jobs operating against GCE
oc create secret generic cluster-secrets-gcp --from-file=cluster/test-deploy/gcp/gce.json --from-file=cluster/test-deploy/gcp/ssh-privatekey --from-file=cluster/test-deploy/gcp/ssh-publickey --from-file=cluster/test-deploy/gcp/ops-mirror.pem -o yaml --dry-run | oc apply -f -
# gce.json is used by jobs operating against AWS
oc create secret generic cluster-secrets-aws --from-file=cluster/test-deploy/aws/.awscred --from-file=cluster/test-deploy/aws/pull-secret --from-file=cluster/test-deploy/aws/license --from-file=cluster/test-deploy/aws/ssh-privatekey --from-file=cluster/test-deploy/aws/ssh-publickey -o yaml --dry-run | oc apply -f -
.PHONY: prow-secrets

prow-builds:
Expand Down Expand Up @@ -136,10 +138,12 @@ prow-services:
.PHONY: prow-services

prow-cluster-jobs:
oc create configmap cluster-profile-aws --from-file=cluster/test-deploy/aws/openshift.yaml -o yaml --dry-run | oc apply -f -
oc create configmap cluster-profile-gcp --from-file=cluster/test-deploy/gcp/vars.yaml --from-file=cluster/test-deploy/gcp/vars-origin.yaml -o yaml --dry-run | oc apply -f -
oc create configmap cluster-profile-gcp-ha --from-file=cluster/test-deploy/gcp/vars.yaml --from-file=cluster/test-deploy/gcp/vars-origin.yaml -o yaml --dry-run | oc apply -f -
oc create configmap cluster-profile-gcp-ha-static --from-file=cluster/test-deploy/gcp/vars.yaml --from-file=cluster/test-deploy/gcp/vars-origin.yaml -o yaml --dry-run | oc apply -f -
oc create configmap prow-job-cluster-launch-e2e --from-file=cluster/ci/config/prow/jobs/cluster-launch-e2e.yaml -o yaml --dry-run | oc apply -f -
oc create configmap prow-job-cluster-launch-installer-e2e --from-file=cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml -o yaml --dry-run | oc apply -f -
oc create configmap prow-job-master-sidecar --from-file=cluster/ci/config/prow/jobs/master-sidecar.yaml -o yaml --dry-run | oc apply -f -
.PHONY: prow-cluster-jobs

Expand Down Expand Up @@ -168,6 +172,7 @@ projects: gcsweb kube-state-metrics oauth-proxy origin origin-stable origin-rele

origin:
oc create configmap ci-operator-origin --from-file=projects/origin/config.json -o yaml --dry-run | oc apply -f -
oc create configmap ci-operator-origin-installer --from-file=projects/openshift-installer/config.json -o yaml --dry-run | oc apply -f -
oc create configmap ci-operator-origin-web-console-server --from-file=config.json=projects/origin/web-console-server.config.json -o yaml --dry-run | oc apply -f -
$(MAKE) apply WHAT=projects/origin/src-cache-origin.yaml
.PHONY: origin
Expand Down
82 changes: 82 additions & 0 deletions cluster/ci/config/prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ tide:
- openshift/node-problem-detector
- openshift/kubernetes-autoscaler
- openshift/openshift-restclient-java
- openshift/installer
labels:
- lgtm
missingLabels:
Expand Down Expand Up @@ -1570,6 +1571,87 @@ presubmits:
args:
- check

openshift/installer:
- name: pull-ci-origin-installer-unit
agent: kubernetes
context: ci/prow/unit
branches:
- master
rerun_command: "/test unit"
always_run: true
trigger: "((?m)^/test( all| unit),?(\\s+|$))"
decorate: true
spec:
serviceAccountName: ci-operator
containers:
- name: test
image: ci-operator:latest
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
name: ci-operator-origin-installer
key: config.json
command:
- ci-operator
args:
- --delete-when-idle=10m
- --artifact-dir=$(ARTIFACTS)
- --dry-run=false
- --target=unit

- name: pull-ci-origin-installer-e2e-aws
agent: kubernetes
context: ci/prow/e2e-aws
branches:
- master
rerun_command: "/test e2e-aws"
always_run: true
trigger: "((?m)^/test( all| e2e-aws),?(\\s+|$))"
decorate: true
spec:
serviceAccountName: ci-operator
volumes:
- name: job-definition
configMap:
name: prow-job-cluster-launch-installer-e2e
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: cluster-profile-aws
containers:
- name: test
image: ci-operator:latest
volumeMounts:
- name: job-definition
mountPath: /usr/local/e2e-aws
subPath: cluster-launch-installer-e2e.yaml
- name: cluster-profile
mountPath: /usr/local/e2e-aws-cluster-profile
env:
- name: TEST_FOCUS
value: Suite:openshift/conformance/parallel
- name: JOB_NAME_SAFE
value: e2e-aws
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
name: ci-operator-origin-installer
key: config.json
command:
- ci-operator
- --delete-when-idle=10m
- --dry-run=false
- --artifact-dir=$(ARTIFACTS)
- --secret-dir=/usr/local/e2e-aws-cluster-profile
- --template=/usr/local/e2e-aws
- --target=e2e-aws

postsubmits:
openshift/origin:
- name: ami_build_origin_int_rhel_build
Expand Down
Loading