Skip to content

Commit 3689506

Browse files
committed
# This is a combination of 7 commits.
# This is the 1st commit message: # This is a combination of 7 commits. # This is the 1st commit message: # This is a combination of 7 commits. # This is the 1st commit message: Added go-vet prow job description # This is the commit message #2: deprecate 3.9 prow # This is the commit message #3: remove 3.9 acs-engine builds # This is the commit message #4: Remove stale build # This is the commit message #5: Remove redundant azure-misc plugin config # This is the commit message #6: Gate openshift-azure on an extra needs-signoff label # This is the commit message #7: Automate adding/removing needs-signoff label # This is the commit message #2: deprecate 3.9 prow # This is the commit message #3: remove 3.9 acs-engine builds # This is the commit message #4: Remove stale build # This is the commit message #5: Remove redundant azure-misc plugin config # This is the commit message #6: Gate openshift-azure on an extra needs-signoff label # This is the commit message #7: Automate adding/removing needs-signoff label # This is the commit message #2: deprecate 3.9 prow # This is the commit message #3: remove 3.9 acs-engine builds # This is the commit message #4: Remove stale build # This is the commit message #5: Remove redundant azure-misc plugin config # This is the commit message #6: Gate openshift-azure on an extra needs-signoff label # This is the commit message #7: Automate adding/removing needs-signoff label
1 parent 49bbe25 commit 3689506

File tree

6 files changed

+55
-67
lines changed

6 files changed

+55
-67
lines changed

ci-operator/jobs/openshift/origin/openshift-origin-presubmits.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -851,19 +851,6 @@ presubmits:
851851
rerun_command: "/test azure"
852852
trigger: "((?m)^/test( all| azure),?(\\s+|$))"
853853

854-
- name: test_pull_request_origin_extended_conformance_azure_39
855-
agent: jenkins
856-
labels:
857-
master: ci.openshift.redhat.com
858-
always_run: true
859-
# TODO: Remove once the job is stable
860-
skip_report: true
861-
branches:
862-
- release-3.9
863-
context: ci/openshift-jenkins/azure
864-
rerun_command: "/test azure"
865-
trigger: "((?m)^/test( all| azure),?(\\s+|$))"
866-
867854
- name: test_pull_request_origin_extended_conformance_azure
868855
agent: jenkins
869856
labels:
@@ -876,4 +863,4 @@ presubmits:
876863
- dockerless-build-temporary
877864
context: ci/openshift-jenkins/azure
878865
rerun_command: "/test azure"
879-
trigger: "((?m)^/test( all| azure),?(\\s+|$))"
866+
trigger: "((?m)^/test( all| azure),?(\\s+|$))"

cluster/ci/config/prow/config.yaml

Lines changed: 48 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ tide:
125125
- openshift/descheduler
126126
- openshift/node-problem-detector
127127
- openshift/kubernetes-autoscaler
128-
- openshift/openshift-azure
129128
- openshift/openshift-restclient-java
130129
- openshift/coredns
131130
- openshift/telemeter
@@ -137,6 +136,15 @@ tide:
137136
- needs-ok-to-test
138137
- do-not-merge/work-in-progress
139138
- do-not-merge/hold
139+
- repos:
140+
- openshift/openshift-azure
141+
labels:
142+
- lgtm
143+
missingLabels:
144+
- needs-ok-to-test
145+
- do-not-merge/work-in-progress
146+
- do-not-merge/hold
147+
- do-not-merge/needs-signoff
140148

141149
prowjob_namespace: ci
142150
pod_namespace: ci
@@ -2353,6 +2361,45 @@ presubmits:
23532361
args:
23542362
- ./hack/yaml-lint.sh
23552363

2364+
- name: ci-pull-openshift-installer-tf-lint
2365+
trigger: "(?m)^/test tf-lint"
2366+
rerun_command: "/test tf-lint"
2367+
context: ci/prow/tf-lint
2368+
always_run: true
2369+
skip_report: false
2370+
agent: kubernetes
2371+
decorate: true
2372+
spec:
2373+
containers:
2374+
- image: quay.io/coreos/tflint
2375+
env:
2376+
- name: IS_CONTAINER
2377+
value: 'TRUE'
2378+
command:
2379+
- sh
2380+
args:
2381+
- ./hack/tf-lint.sh
2382+
2383+
- name: go-vet
2384+
trigger: "(?m)^/test go-vet"
2385+
rerun_command: "/test go-vet"
2386+
context: ci/prow/go-vet
2387+
always_run: true
2388+
skip_report: false
2389+
agent: kubernetes
2390+
decorate: true
2391+
spec:
2392+
containers:
2393+
- image: quay.io/coreos/golang-testing
2394+
env:
2395+
- name: IS_CONTAINER
2396+
value: 'TRUE'
2397+
command:
2398+
- sh
2399+
args:
2400+
- ./hack/go-vet.sh
2401+
- "./installer/..."
2402+
23562403
openshift/ci-vm-operator:
23572404
- name: pull-ci-vm-operator-build
23582405
agent: kubernetes
@@ -2698,12 +2745,6 @@ postsubmits:
26982745
master: ci.openshift.redhat.com
26992746
branches:
27002747
- release-3.10
2701-
- name: test_branch_origin_extended_conformance_azure_39
2702-
agent: jenkins
2703-
labels:
2704-
master: ci.openshift.redhat.com
2705-
branches:
2706-
- release-3.9
27072748
- name: test_branch_origin_extended_conformance_azure_310
27082749
agent: jenkins
27092750
labels:
@@ -3995,10 +4036,6 @@ periodics:
39954036
agent: jenkins
39964037
labels:
39974038
master: ci.openshift.redhat.com
3998-
- name: azure_build_node_image_centos_39
3999-
agent: jenkins
4000-
labels:
4001-
master: ci.openshift.redhat.com
40024039
- name: azure_build_node_image_centos
40034040
agent: jenkins
40044041
labels:
@@ -4013,10 +4050,6 @@ periodics:
40134050
agent: jenkins
40144051
labels:
40154052
master: ci.openshift.redhat.com
4016-
- name: azure_build_node_image_rhel_39
4017-
agent: jenkins
4018-
labels:
4019-
master: ci.openshift.redhat.com
40204053

40214054
- name: ami_build_ose_master
40224055
agent: jenkins

cluster/ci/config/prow/plugins.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ config_updater:
118118
sigmention:
119119
regexp: (?m)@openshift/sig-([\w-]*)
120120

121+
label:
122+
additional_labels:
123+
- do-not-merge/needs-signoff
124+
121125
external_plugins:
122126
openshift:
123127
- name: refresh
@@ -183,6 +187,8 @@ plugins:
183187
- trigger
184188

185189
openshift/azure-misc:
190+
- approve
191+
- blunderbuss
186192
- golint
187193
- trigger
188194

@@ -324,10 +330,6 @@ plugins:
324330
- wip
325331
- yuks
326332

327-
openshift/azure-misc:
328-
- approve
329-
- blunderbuss
330-
331333
kubernetes-incubator/cri-o:
332334
- trigger
333335

projects/azure/acs-engine/test-image-builds/Dockerfiles/3.9/Dockerfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

projects/azure/acs-engine/test-image-builds/build-3.9.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

projects/azure/config-updater/config-updater.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ items:
1414
targets:
1515
- projects/azure/acs-engine/binary-build.yaml
1616
- projects/azure/acs-engine/test-image-builds/build-3.10.yaml
17-
- projects/azure/acs-engine/test-image-builds/build-3.9.yaml
1817
- projects/azure/acs-engine/test-image-builds/is-common.yaml
1918
- projects/azure/azure-purge/cronjob.yaml
2019
- projects/azure/base-images/alpine.yaml

0 commit comments

Comments
 (0)