From 227c298275935b00fd5801de75460637ab4a0db7 Mon Sep 17 00:00:00 2001 From: Michalis Kargakis Date: Mon, 2 Oct 2017 16:14:20 +0200 Subject: [PATCH 1/4] Collapse prow services in a single target --- Makefile | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index d07043d1d6b50..aba6bed32c60a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 commenter .PHONY: prow prow-crd: @@ -41,37 +41,16 @@ prow-rbac: 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_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/jenkins_proxy.yaml | oc apply -f - 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: # RETEST_TOKEN is the token used by the retester periodic job to rerun tests for PRs From 25b64a3a6c75291b31cc244ba95b61cbff54115c Mon Sep 17 00:00:00 2001 From: Michalis Kargakis Date: Mon, 2 Oct 2017 16:14:53 +0200 Subject: [PATCH 2/4] Rename jenkins operator manifest --- Makefile | 4 ++-- .../{jenkins-operator.yaml => jenkins_operator.yaml} | 0 ...{jenkins-operator_rbac.yaml => jenkins_operator_rbac.yaml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename cluster/ci/config/prow/openshift/{jenkins-operator.yaml => jenkins_operator.yaml} (100%) rename cluster/ci/config/prow/openshift/{jenkins-operator_rbac.yaml => jenkins_operator_rbac.yaml} (100%) diff --git a/Makefile b/Makefile index aba6bed32c60a..c8377fa84e6b7 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ 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 - @@ -45,7 +45,7 @@ prow-services: oc process -f cluster/ci/config/prow/openshift/deck.yaml | oc apply -f - 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 - - oc process -f cluster/ci/config/prow/openshift/jenkins-operator.yaml | oc apply -f - + 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 - oc process -f cluster/ci/config/prow/openshift/plank.yaml | oc apply -f - oc process -f cluster/ci/config/prow/openshift/sinker.yaml | oc apply -f - diff --git a/cluster/ci/config/prow/openshift/jenkins-operator.yaml b/cluster/ci/config/prow/openshift/jenkins_operator.yaml similarity index 100% rename from cluster/ci/config/prow/openshift/jenkins-operator.yaml rename to cluster/ci/config/prow/openshift/jenkins_operator.yaml diff --git a/cluster/ci/config/prow/openshift/jenkins-operator_rbac.yaml b/cluster/ci/config/prow/openshift/jenkins_operator_rbac.yaml similarity index 100% rename from cluster/ci/config/prow/openshift/jenkins-operator_rbac.yaml rename to cluster/ci/config/prow/openshift/jenkins_operator_rbac.yaml From 96e9f9b5abb481043793d812ddbbc9741399b78b Mon Sep 17 00:00:00 2001 From: Michalis Kargakis Date: Mon, 2 Oct 2017 16:15:57 +0200 Subject: [PATCH 3/4] Plumb prowjob access binding in prow make target --- Makefile | 1 + cluster/ci/config/prow/prowjob_access.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index c8377fa84e6b7..0794dc56badc0 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ prow: prow-crd prow-config prow-secrets prow-images prow-rbac prow-services comm 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: diff --git a/cluster/ci/config/prow/prowjob_access.yaml b/cluster/ci/config/prow/prowjob_access.yaml index 9b7ab5a6d1aca..368d83c2fdffa 100644 --- a/cluster/ci/config/prow/prowjob_access.yaml +++ b/cluster/ci/config/prow/prowjob_access.yaml @@ -24,3 +24,5 @@ items: - list - create - delete + - update + - patch From 8ecbb19b917df0580b1ca1a80e24be7d2b370c97 Mon Sep 17 00:00:00 2001 From: Michalis Kargakis Date: Mon, 2 Oct 2017 16:18:14 +0200 Subject: [PATCH 4/4] Rename commenter target to prow-jobs Signed-off-by: Michalis Kargakis --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0794dc56badc0..451567868bfcf 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ all: jenkins prow mungegithub projects jenkins: .PHONY: jenkins -prow: prow-crd prow-config prow-secrets prow-images prow-rbac prow-services commenter +prow: prow-crd prow-config prow-secrets prow-images prow-rbac prow-services prow-jobs .PHONY: prow prow-crd: @@ -53,11 +53,11 @@ prow-services: oc process -f cluster/ci/config/prow/openshift/splice.yaml | oc apply -f - .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