Skip to content

Commit dec4e93

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #6927 from hongkailiu/revertc014110d269e46ed229f936fd86eb2e4a248ea7c
Revert "Remove configured jobs relating to build01"
2 parents 3158b4a + ebc60cb commit dec4e93

File tree

4 files changed

+205
-0
lines changed

4 files changed

+205
-0
lines changed

‎ci-operator/jobs/infra-periodics.yaml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,63 @@
11
periodics:
2+
- agent: kubernetes
3+
labels:
4+
ci.openshift.io/role: infra
5+
cluster: default
6+
cron: "30 7 * * 1" # Run at 07:30 UTC each Monday
7+
decorate: true
8+
name: periodic-acme-cert-issuer-for-build01
9+
skip_cloning: true
10+
spec:
11+
containers:
12+
- args:
13+
- -c
14+
- |
15+
set -o errexit
16+
set -o nounset
17+
set -o pipefail
18+
oc --kubeconfig=/etc/build-farm-credentials/kubeconfig whoami
19+
oc --kubeconfig=/etc/build-farm-credentials/kubeconfig project
20+
/acme/acme.sh --version
21+
/acme/acme.sh --issue --dns dns_aws -d '*.apps.build01.ci.devcluster.openshift.com' --home /data --dnssleep 60 --fullchain-file /data/app.fullchain.cer --key-file /data/app.key --force
22+
ls -al /data
23+
oc --kubeconfig=/etc/build-farm-credentials/kubeconfig -n openshift-ingress create secret tls app-cert --cert=/data/app.fullchain.cer --key=/data/app.key --dry-run -o yaml | oc --kubeconfig=/etc/build-farm-credentials/kubeconfig -n openshift-ingress apply -f -
24+
/acme/acme.sh --issue --dns dns_aws -d 'api.build01.ci.devcluster.openshift.com' --home /data --dnssleep 60 --fullchain-file /data/apiserver.fullchain.cer --key-file /data/apiserver.key --force
25+
ls -al /data
26+
oc --kubeconfig=/etc/build-farm-credentials/kubeconfig -n openshift-config create secret tls apiserver-cert --cert=/data/apiserver.fullchain.cer --key=/data/apiserver.key --dry-run -o yaml | oc --kubeconfig=/etc/build-farm-credentials/kubeconfig -n openshift-config apply -f -
27+
command:
28+
- /bin/bash
29+
env:
30+
- name: AWS_ACCESS_KEY_ID
31+
valueFrom:
32+
secretKeyRef:
33+
name: aws-ci-infra-openshift-ci-robot-credentials
34+
key: AWS_ACCESS_KEY_ID
35+
- name: AWS_SECRET_ACCESS_KEY
36+
valueFrom:
37+
secretKeyRef:
38+
name: aws-ci-infra-openshift-ci-robot-credentials
39+
key: AWS_SECRET_ACCESS_KEY
40+
image: "registry.svc.ci.openshift.org/ci/ca-cert-issuer:latest"
41+
imagePullPolicy: Always
42+
name: ""
43+
resources:
44+
requests:
45+
cpu: 500m
46+
volumeMounts:
47+
- mountPath: /data
48+
name: data
49+
- mountPath: /etc/build-farm-credentials
50+
name: build-farm-credentials
51+
readOnly: true
52+
volumes:
53+
- name: data
54+
emptyDir: {}
55+
- name: build-farm-credentials
56+
secret:
57+
items:
58+
- key: sa.ca-cert-issuer.build01.config
59+
path: kubeconfig
60+
secretName: build-farm-credentials
261
- agent: kubernetes
362
labels:
463
ci.openshift.io/role: infra

‎ci-operator/jobs/openshift/release/openshift-release-master-postsubmits.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,60 @@
11
postsubmits:
22
openshift/release:
3+
- agent: kubernetes
4+
branches:
5+
- master
6+
decorate: true
7+
labels:
8+
ci.openshift.io/role: infra
9+
name: branch-ci-openshift-release-master-build01-apply
10+
spec:
11+
containers:
12+
- args:
13+
- --config-dir=clusters/build-clusters/01_cluster
14+
- --confirm=true
15+
- --kubeconfig=/etc/build-farm-credentials/kubeconfig
16+
- --context=ci/api-build01-ci-devcluster-openshift-com:6443
17+
command:
18+
- applyconfig
19+
env:
20+
- name: build01_build01_reg_auth_value
21+
valueFrom:
22+
secretKeyRef:
23+
key: build01_build01_reg_auth_value.txt
24+
name: build-farm-credentials
25+
- name: build01_ci_reg_auth_value
26+
valueFrom:
27+
secretKeyRef:
28+
key: build01_ci_reg_auth_value.txt
29+
name: build-farm-credentials
30+
- name: github_client_secret
31+
valueFrom:
32+
secretKeyRef:
33+
key: build01_github_client_secret
34+
name: build-farm-credentials
35+
- name: slack_api_url
36+
valueFrom:
37+
secretKeyRef:
38+
key: url
39+
name: ci-slack-api-url
40+
image: registry.svc.ci.openshift.org/ci/applyconfig:latest
41+
imagePullPolicy: Always
42+
name: ""
43+
resources:
44+
requests:
45+
cpu: 10m
46+
volumeMounts:
47+
- mountPath: /etc/build-farm-credentials
48+
name: build-farm-credentials
49+
readOnly: true
50+
serviceAccountName: config-updater
51+
volumes:
52+
- name: build-farm-credentials
53+
secret:
54+
items:
55+
- key: sa.config-updater.build01.config
56+
path: kubeconfig
57+
secretName: build-farm-credentials
358
- agent: kubernetes
459
branches:
560
- ^master$

‎ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,65 @@ presubmits:
4646
requests:
4747
cpu: 10m
4848
trigger: (?m)^/test( | .* )build-farm-consistency,?($|\s.*)
49+
- agent: kubernetes
50+
always_run: true
51+
branches:
52+
- master
53+
context: ci/build-farm/build01-dry
54+
decorate: true
55+
name: pull-ci-openshift-release-master-build01-dry
56+
rerun_command: /test build01-dry
57+
spec:
58+
containers:
59+
- args:
60+
- --config-dir
61+
- clusters/build-clusters/01_cluster
62+
- --kubeconfig
63+
- /etc/build-farm-credentials/kubeconfig
64+
- --context
65+
- ci/api-build01-ci-devcluster-openshift-com:6443
66+
command:
67+
- applyconfig
68+
env:
69+
- name: build01_build01_reg_auth_value
70+
valueFrom:
71+
secretKeyRef:
72+
key: build01_build01_reg_auth_value.txt
73+
name: build-farm-credentials
74+
- name: build01_ci_reg_auth_value
75+
valueFrom:
76+
secretKeyRef:
77+
key: build01_ci_reg_auth_value.txt
78+
name: build-farm-credentials
79+
- name: github_client_secret
80+
valueFrom:
81+
secretKeyRef:
82+
key: build01_github_client_secret
83+
name: build-farm-credentials
84+
- name: slack_api_url
85+
valueFrom:
86+
secretKeyRef:
87+
key: url
88+
name: ci-slack-api-url
89+
image: registry.svc.ci.openshift.org/ci/applyconfig:latest
90+
imagePullPolicy: Always
91+
name: ""
92+
resources:
93+
requests:
94+
cpu: 10m
95+
volumeMounts:
96+
- mountPath: /etc/build-farm-credentials
97+
name: build-farm-credentials
98+
readOnly: true
99+
serviceAccountName: config-updater
100+
volumes:
101+
- name: build-farm-credentials
102+
secret:
103+
items:
104+
- key: sa.config-updater.build01.config
105+
path: kubeconfig
106+
secretName: build-farm-credentials
107+
trigger: (?m)^/test( | .* )build01-dry,?($|\s.*)
49108
- agent: kubernetes
50109
always_run: true
51110
branches:

‎core-services/prow/02_config/_plugins.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ config_updater:
235235
name: ci-operator-misc-configs
236236
ci-operator/config/**/*master*.yaml:
237237
clusters:
238+
ci/api-build01-ci-devcluster-openshift-com:6443:
239+
- ci
238240
default:
239241
- ci
240242
- ci-stg
@@ -615,6 +617,8 @@ config_updater:
615617
name: prow-job-cluster-launch-installer-custom-test-image
616618
ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml:
617619
clusters:
620+
ci/api-build01-ci-devcluster-openshift-com:6443:
621+
- ci
618622
default:
619623
- ci
620624
- ci-stg
@@ -657,12 +661,16 @@ config_updater:
657661
name: prow-job-cluster-launch-installer-remote-libvirt-e2e
658662
ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml:
659663
clusters:
664+
ci/api-build01-ci-devcluster-openshift-com:6443:
665+
- ci
660666
default:
661667
- ci
662668
- ci-stg
663669
name: prow-job-cluster-launch-installer-src
664670
ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml:
665671
clusters:
672+
ci/api-build01-ci-devcluster-openshift-com:6443:
673+
- ci
666674
default:
667675
- ci
668676
- ci-stg
@@ -727,66 +735,88 @@ config_updater:
727735
name: grafana-dashboard-definitions-0
728736
cluster/test-deploy/aws-4.0/*.yaml:
729737
clusters:
738+
ci/api-build01-ci-devcluster-openshift-com:6443:
739+
- ci
730740
default:
731741
- ci
732742
- ci-stg
733743
name: cluster-profile-aws-centos-40
734744
cluster/test-deploy/aws-atomic/*.yaml:
735745
clusters:
746+
ci/api-build01-ci-devcluster-openshift-com:6443:
747+
- ci
736748
default:
737749
- ci
738750
- ci-stg
739751
name: cluster-profile-aws-atomic
740752
cluster/test-deploy/aws-centos/*.yaml:
741753
clusters:
754+
ci/api-build01-ci-devcluster-openshift-com:6443:
755+
- ci
742756
default:
743757
- ci
744758
- ci-stg
745759
name: cluster-profile-aws-centos
746760
cluster/test-deploy/aws-gluster/*.yaml:
747761
clusters:
762+
ci/api-build01-ci-devcluster-openshift-com:6443:
763+
- ci
748764
default:
749765
- ci
750766
- ci-stg
751767
name: cluster-profile-aws-gluster
752768
cluster/test-deploy/gcp-4.0/*.yaml:
753769
clusters:
770+
ci/api-build01-ci-devcluster-openshift-com:6443:
771+
- ci
754772
default:
755773
- ci
756774
- ci-stg
757775
name: cluster-profile-gcp-40
758776
cluster/test-deploy/gcp-crio/*.yaml:
759777
clusters:
778+
ci/api-build01-ci-devcluster-openshift-com:6443:
779+
- ci
760780
default:
761781
- ci
762782
- ci-stg
763783
name: cluster-profile-gcp-crio
764784
cluster/test-deploy/gcp-ha-static/*.yaml:
765785
clusters:
786+
ci/api-build01-ci-devcluster-openshift-com:6443:
787+
- ci
766788
default:
767789
- ci
768790
- ci-stg
769791
name: cluster-profile-gcp-ha-static
770792
cluster/test-deploy/gcp-ha/*.yaml:
771793
clusters:
794+
ci/api-build01-ci-devcluster-openshift-com:6443:
795+
- ci
772796
default:
773797
- ci
774798
- ci-stg
775799
name: cluster-profile-gcp-ha
776800
cluster/test-deploy/gcp-logging/*.yaml:
777801
clusters:
802+
ci/api-build01-ci-devcluster-openshift-com:6443:
803+
- ci
778804
default:
779805
- ci
780806
- ci-stg
781807
name: cluster-profile-gcp-logging
782808
cluster/test-deploy/gcp/*.yaml:
783809
clusters:
810+
ci/api-build01-ci-devcluster-openshift-com:6443:
811+
- ci
784812
default:
785813
- ci
786814
- ci-stg
787815
name: cluster-profile-gcp
788816
cluster/test-deploy/ovirt/*.yaml:
789817
clusters:
818+
ci/api-build01-ci-devcluster-openshift-com:6443:
819+
- ci
790820
default:
791821
- ci
792822
- ci-stg
@@ -839,6 +869,8 @@ config_updater:
839869
name: releases
840870
core-services/release-controller/_repos/*:
841871
clusters:
872+
ci/api-build01-ci-devcluster-openshift-com:6443:
873+
- ocp
842874
default:
843875
- ocp
844876
name: base-repos

0 commit comments

Comments
 (0)