Merge pull request #18901 from aravindhp/ovn-cno-custom-vxlan

cno/ovn: add Windows custom VXLAN port tests
openshift · Jun 29, 2021 · ddf0b12 · ddf0b12
2 parents d3d29e6 + 7bfd6e1
commit ddf0b12
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 0 deletions.
diff --git a/...ig/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.7.yaml b/...ig/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.7.yaml
@@ -111,6 +111,12 @@ tests:
     test:
     - ref: windows-e2e-operator-test
     workflow: ipi-aws-ovn-hybrid
+- as: e2e-vsphere-windows
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
 - as: e2e-vsphere-ovn
   steps:
     cluster_profile: vsphere

diff --git a/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.7.yaml b/ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.7.yaml
@@ -93,6 +93,12 @@ tests:
     test:
     - ref: windows-e2e-operator-test
     workflow: ipi-aws-ovn-hybrid
+- as: e2e-vsphere-windows
+  steps:
+    cluster_profile: vsphere
+    test:
+    - ref: windows-e2e-operator-test-with-custom-vxlan-port
+    workflow: ipi-vsphere-ovn-hybrid-custom-vxlan-port
 - as: e2e-vsphere-ovn
   steps:
     cluster_profile: vsphere

diff --git a/...t/cluster-network-operator/openshift-cluster-network-operator-release-4.7-presubmits.yaml b/...t/cluster-network-operator/openshift-cluster-network-operator-release-4.7-presubmits.yaml
@@ -801,6 +801,72 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.7
+    cluster: vsphere
+    context: ci/prow/e2e-vsphere-windows
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-network-operator-release-4.7-e2e-vsphere-windows
+    rerun_command: /test e2e-vsphere-windows
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-vsphere-windows-cluster-profile
+        - --target=e2e-vsphere-windows
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-vsphere-windows-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere-windows,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

diff --git a/...erator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.7-presubmits.yaml b/...erator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.7-presubmits.yaml
@@ -603,6 +603,72 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-vsphere-ovn,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.7
+    cluster: vsphere
+    context: ci/prow/e2e-vsphere-windows
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-ovn-kubernetes-release-4.7-e2e-vsphere-windows
+    rerun_command: /test e2e-vsphere-windows
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/usr/local/e2e-vsphere-windows-cluster-profile
+        - --target=e2e-vsphere-windows
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-vsphere-windows-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-vsphere
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-vsphere-windows,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: