Skip to content

Another makefile update #206

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.

Sign up for GitHub

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

Merged
0xmichalis merged 4 commits into from
Oct 2, 2017
Merged

Another makefile update #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
227c298
Collapse prow services in a single target
0xmichalis Oct 2, 2017
25b64a3
Rename jenkins operator manifest
0xmichalis Oct 2, 2017
96e9f9b
Plumb prowjob access binding in prow make target
0xmichalis Oct 2, 2017
8ecbb19
Rename commenter target to prow-jobs
0xmichalis Oct 2, 2017
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
38 changes: 9 additions & 29 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ all: jenkins prow mungegithub projects
jenkins:
.PHONY: jenkins

prow: prow-crd prow-config prow-secrets prow-images prow-rbac hook plank jenkins-proxy jenkins-operator deck horologium splice sinker commenter
prow: prow-crd prow-config prow-secrets prow-images prow-rbac prow-services prow-jobs
.PHONY: prow

prow-crd:
oc apply -f cluster/ci/config/prow/prow_crd.yaml
oc apply -f cluster/ci/config/prow/prowjob_access.yaml
.PHONY: prow-crd

prow-config:
Expand Down Expand Up @@ -36,48 +37,27 @@ prow-rbac:
oc process -f cluster/ci/config/prow/openshift/deck_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/hook_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/horologium_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/jenkins-operator_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/jenkins_operator_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/plank_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/sinker_rbac.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/splice_rbac.yaml | oc apply -f -

hook:
oc process -f cluster/ci/config/prow/openshift/hook.yaml | oc apply -f -
.PHONY: hook

deck:
prow-services:
oc process -f cluster/ci/config/prow/openshift/deck.yaml | oc apply -f -
.PHONY: deck

horologium:
oc process -f cluster/ci/config/prow/openshift/hook.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/horologium.yaml | oc apply -f -
.PHONY: horologium

jenkins-proxy:
oc process -f cluster/ci/config/prow/openshift/jenkins_operator.yaml | oc apply -f -
oc process -f cluster/ci/config/prow/openshift/jenkins_proxy.yaml | oc apply -f -
.PHONY: jenkins-proxy

jenkins-operator:
oc process -f cluster/ci/config/prow/openshift/jenkins-operator.yaml | oc apply -f -
.PHONY: jenkins-operator

plank:
oc process -f cluster/ci/config/prow/openshift/plank.yaml | oc apply -f -
.PHONY: plank

sinker:
oc process -f cluster/ci/config/prow/openshift/sinker.yaml | oc apply -f -
.PHONY: sinker

splice:
oc process -f cluster/ci/config/prow/openshift/splice.yaml | oc apply -f -
.PHONY: splice
.PHONY: prow-services

commenter:
prow-jobs:
# RETEST_TOKEN is the token used by the retester periodic job to rerun tests for PRs
oc create secret generic retester-oauth-token --from-literal=oauth=${RETEST_TOKEN} -o yaml --dry-run | oc apply -f -
oc process -f cluster/ci/jobs/commenter.yaml | oc apply -f -
.PHONY: commenter
.PHONY: prow-jobs

mungegithub:
.PHONY: mungegithub
Expand Down
0 ...nfig/prow/openshift/jenkins-operator.yaml → ...nfig/prow/openshift/jenkins_operator.yaml
View file
Open in desktop
File renamed without changes.
0 ...prow/openshift/jenkins-operator_rbac.yaml → ...prow/openshift/jenkins_operator_rbac.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions cluster/ci/config/prow/prowjob_access.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ items:
- list
- create
- delete
- update
- patch