Skip to content

Commit f897f7a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #21604 from osherdp/build/static-ips
add static IP jobs for assisted-service and assisted-test-infra
2 parents 2e40d1e + 377caee commit f897f7a

File tree

5 files changed

+242
-0
lines changed

5 files changed

+242
-0
lines changed

‎ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,14 @@ tests:
343343
NUM_MASTERS=1
344344
TEST_SUITE: minimal
345345
workflow: baremetalds-assisted-install
346+
- as: e2e-metal-assisted-static-ip
347+
steps:
348+
cluster_profile: packet
349+
env:
350+
ASSISTED_CONFIG: |
351+
STATIC_IPS=yes
352+
TEST_SUITE: minimal
353+
workflow: baremetalds-assisted-install
346354
- as: e2e-metal-assisted-kube-api
347355
run_if_changed: ^(cmd/.*|data/.*|deploy/.*|hack/.*|internal/.*|pkg/.*|tools/.*|Dockerfile\..*|Makefile|go\.mod|go\.sum|swagger.yaml)$
348356
steps:

‎ci-operator/config/openshift/assisted-test-infra/openshift-assisted-test-infra-master.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,23 @@ tests:
149149
IPv6=true
150150
TEST_SUITE: full
151151
workflow: baremetalds-assisted
152+
- as: e2e-metal-assisted-static-ip
153+
steps:
154+
cluster_profile: packet
155+
env:
156+
ASSISTED_CONFIG: |
157+
STATIC_IPS=yes
158+
TEST_SUITE: minimal
159+
workflow: baremetalds-assisted-install
160+
- as: e2e-metal-assisted-static-ip-periodic
161+
cron: '@daily'
162+
steps:
163+
cluster_profile: packet
164+
env:
165+
ASSISTED_CONFIG: |
166+
STATIC_IPS=yes
167+
TEST_SUITE: full
168+
workflow: baremetalds-assisted-install
152169
- as: e2e-metal-assisted-none
153170
optional: true
154171
run_if_changed: ^(terraform_files/.*|.*/controllers/.*)$

‎ci-operator/jobs/openshift/assisted-service/openshift-assisted-service-master-presubmits.yaml

+75
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,81 @@ presubmits:
803803
secret:
804804
secretName: result-aggregator
805805
trigger: (?m)^/test( | .* )e2e-metal-assisted-single-node,?($|\s.*)
806+
- agent: kubernetes
807+
always_run: false
808+
branches:
809+
- ^master$
810+
- ^master-
811+
cluster: build01
812+
context: ci/prow/e2e-metal-assisted-static-ip
813+
decorate: true
814+
decoration_config:
815+
skip_cloning: true
816+
labels:
817+
ci-operator.openshift.io/prowgen-controlled: "true"
818+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
819+
name: pull-ci-openshift-assisted-service-master-e2e-metal-assisted-static-ip
820+
optional: true
821+
rerun_command: /test e2e-metal-assisted-static-ip
822+
spec:
823+
containers:
824+
- args:
825+
- --gcs-upload-secret=/secrets/gcs/service-account.json
826+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
827+
- --lease-server-credentials-file=/etc/boskos/credentials
828+
- --report-credentials-file=/etc/report/credentials
829+
- --secret-dir=/secrets/ci-pull-credentials
830+
- --secret-dir=/usr/local/e2e-metal-assisted-static-ip-cluster-profile
831+
- --target=e2e-metal-assisted-static-ip
832+
command:
833+
- ci-operator
834+
image: ci-operator:latest
835+
imagePullPolicy: Always
836+
name: ""
837+
resources:
838+
requests:
839+
cpu: 10m
840+
volumeMounts:
841+
- mountPath: /etc/boskos
842+
name: boskos
843+
readOnly: true
844+
- mountPath: /secrets/ci-pull-credentials
845+
name: ci-pull-credentials
846+
readOnly: true
847+
- mountPath: /usr/local/e2e-metal-assisted-static-ip-cluster-profile
848+
name: cluster-profile
849+
- mountPath: /secrets/gcs
850+
name: gcs-credentials
851+
readOnly: true
852+
- mountPath: /etc/pull-secret
853+
name: pull-secret
854+
readOnly: true
855+
- mountPath: /etc/report
856+
name: result-aggregator
857+
readOnly: true
858+
serviceAccountName: ci-operator
859+
volumes:
860+
- name: boskos
861+
secret:
862+
items:
863+
- key: credentials
864+
path: credentials
865+
secretName: boskos-credentials
866+
- name: ci-pull-credentials
867+
secret:
868+
secretName: ci-pull-credentials
869+
- name: cluster-profile
870+
projected:
871+
sources:
872+
- secret:
873+
name: cluster-secrets-packet
874+
- name: pull-secret
875+
secret:
876+
secretName: registry-pull-credentials
877+
- name: result-aggregator
878+
secret:
879+
secretName: result-aggregator
880+
trigger: (?m)^/test( | .* )e2e-metal-assisted-static-ip,?($|\s.*)
806881
- agent: kubernetes
807882
always_run: true
808883
branches:

‎ci-operator/jobs/openshift/assisted-test-infra/openshift-assisted-test-infra-master-periodics.yaml

+74
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,80 @@ periodics:
647647
- name: result-aggregator
648648
secret:
649649
secretName: result-aggregator
650+
- agent: kubernetes
651+
cluster: build01
652+
cron: '@daily'
653+
decorate: true
654+
decoration_config:
655+
skip_cloning: true
656+
extra_refs:
657+
- base_ref: master
658+
org: openshift
659+
repo: assisted-test-infra
660+
labels:
661+
ci-operator.openshift.io/prowgen-controlled: "true"
662+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
663+
name: periodic-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-static-ip-periodic
664+
reporter_config:
665+
slack:
666+
channel: '#assisted-deployment-ci'
667+
job_states_to_report:
668+
- failure
669+
- error
670+
report_template: '{{ if eq .Status.State "success" }} :green_jenkins_circle:
671+
{{ else }} :red_jenkins_circle: {{ end }} Job *{{.Spec.Job}}* ended with *{{.Status.State}}*.
672+
<{{.Status.URL}}|View logs>'
673+
spec:
674+
containers:
675+
- args:
676+
- --gcs-upload-secret=/secrets/gcs/service-account.json
677+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
678+
- --lease-server-credentials-file=/etc/boskos/credentials
679+
- --report-credentials-file=/etc/report/credentials
680+
- --secret-dir=/usr/local/e2e-metal-assisted-static-ip-periodic-cluster-profile
681+
- --target=e2e-metal-assisted-static-ip-periodic
682+
command:
683+
- ci-operator
684+
image: ci-operator:latest
685+
imagePullPolicy: Always
686+
name: ""
687+
resources:
688+
requests:
689+
cpu: 10m
690+
volumeMounts:
691+
- mountPath: /etc/boskos
692+
name: boskos
693+
readOnly: true
694+
- mountPath: /usr/local/e2e-metal-assisted-static-ip-periodic-cluster-profile
695+
name: cluster-profile
696+
- mountPath: /secrets/gcs
697+
name: gcs-credentials
698+
readOnly: true
699+
- mountPath: /etc/pull-secret
700+
name: pull-secret
701+
readOnly: true
702+
- mountPath: /etc/report
703+
name: result-aggregator
704+
readOnly: true
705+
serviceAccountName: ci-operator
706+
volumes:
707+
- name: boskos
708+
secret:
709+
items:
710+
- key: credentials
711+
path: credentials
712+
secretName: boskos-credentials
713+
- name: cluster-profile
714+
projected:
715+
sources:
716+
- secret:
717+
name: cluster-secrets-packet
718+
- name: pull-secret
719+
secret:
720+
secretName: registry-pull-credentials
721+
- name: result-aggregator
722+
secret:
723+
secretName: result-aggregator
650724
- agent: kubernetes
651725
cluster: build01
652726
cron: '@daily'

‎ci-operator/jobs/openshift/assisted-test-infra/openshift-assisted-test-infra-master-presubmits.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,74 @@ presubmits:
546546
secret:
547547
secretName: result-aggregator
548548
trigger: (?m)^/test( | .* )e2e-metal-assisted-single-node,?($|\s.*)
549+
- agent: kubernetes
550+
always_run: false
551+
branches:
552+
- ^master$
553+
- ^master-
554+
cluster: build01
555+
context: ci/prow/e2e-metal-assisted-static-ip
556+
decorate: true
557+
decoration_config:
558+
skip_cloning: true
559+
labels:
560+
ci-operator.openshift.io/prowgen-controlled: "true"
561+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
562+
name: pull-ci-openshift-assisted-test-infra-master-e2e-metal-assisted-static-ip
563+
optional: true
564+
rerun_command: /test e2e-metal-assisted-static-ip
565+
spec:
566+
containers:
567+
- args:
568+
- --gcs-upload-secret=/secrets/gcs/service-account.json
569+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
570+
- --lease-server-credentials-file=/etc/boskos/credentials
571+
- --report-credentials-file=/etc/report/credentials
572+
- --secret-dir=/usr/local/e2e-metal-assisted-static-ip-cluster-profile
573+
- --target=e2e-metal-assisted-static-ip
574+
command:
575+
- ci-operator
576+
image: ci-operator:latest
577+
imagePullPolicy: Always
578+
name: ""
579+
resources:
580+
requests:
581+
cpu: 10m
582+
volumeMounts:
583+
- mountPath: /etc/boskos
584+
name: boskos
585+
readOnly: true
586+
- mountPath: /usr/local/e2e-metal-assisted-static-ip-cluster-profile
587+
name: cluster-profile
588+
- mountPath: /secrets/gcs
589+
name: gcs-credentials
590+
readOnly: true
591+
- mountPath: /etc/pull-secret
592+
name: pull-secret
593+
readOnly: true
594+
- mountPath: /etc/report
595+
name: result-aggregator
596+
readOnly: true
597+
serviceAccountName: ci-operator
598+
volumes:
599+
- name: boskos
600+
secret:
601+
items:
602+
- key: credentials
603+
path: credentials
604+
secretName: boskos-credentials
605+
- name: cluster-profile
606+
projected:
607+
sources:
608+
- secret:
609+
name: cluster-secrets-packet
610+
- name: pull-secret
611+
secret:
612+
secretName: registry-pull-credentials
613+
- name: result-aggregator
614+
secret:
615+
secretName: result-aggregator
616+
trigger: (?m)^/test( | .* )e2e-metal-assisted-static-ip,?($|\s.*)
549617
- agent: kubernetes
550618
always_run: false
551619
branches:

0 commit comments

Comments
 (0)