From b3e6a9418eae26defd0db9ab230a1b4b3b2df8eb Mon Sep 17 00:00:00 2001 From: Neeraj Krishna Gopalakrishna Date: Thu, 16 Apr 2026 12:15:59 +0530 Subject: [PATCH] Move usernamespace test to long running test suite --- .../origin/openshift-priv-origin-main.yaml | 12 --- .../origin/openshift-origin-main.yaml | 12 --- ...openshift-priv-origin-main-presubmits.yaml | 91 ------------------- .../openshift-origin-main-presubmits.yaml | 81 ----------------- 4 files changed, 196 deletions(-) diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml index d7bcfb8d324fe..644db134f5f3e 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml @@ -742,18 +742,6 @@ tests: enable: - observers-resource-watch workflow: openshift-e2e-gcp -- always_run: false - as: e2e-gcp-ovn-usernamespace - optional: true - steps: - cluster_profile: openshift-org-gcp - env: - FEATURE_SET: TechPreviewNoUpgrade - TEST_SUITE: openshift/usernamespace - observers: - enable: - - observers-resource-watch - workflow: openshift-e2e-gcp - always_run: false as: e2e-aws-ovn-kubevirt optional: true diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index 46aa22e6db9bf..0dbdc2146bd13 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -741,18 +741,6 @@ tests: enable: - observers-resource-watch workflow: openshift-e2e-gcp -- always_run: false - as: e2e-gcp-ovn-usernamespace - optional: true - steps: - cluster_profile: openshift-org-gcp - env: - FEATURE_SET: TechPreviewNoUpgrade - TEST_SUITE: openshift/usernamespace - observers: - enable: - - observers-resource-watch - workflow: openshift-e2e-gcp - always_run: false as: e2e-aws-ovn-kubevirt optional: true diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml index ea23a61b2869d..1b5c9bfcf9e85 100644 --- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-main-presubmits.yaml @@ -4741,97 +4741,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(e2e-gcp-ovn-upgrade|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build04 - context: ci/prow/e2e-gcp-ovn-usernamespace - decorate: true - decoration_config: - oauth_token_secret: - key: oauth - name: github-credentials-openshift-ci-robot-private-git-cloner - hidden: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-origin-main-e2e-gcp-ovn-usernamespace - optional: true - path_alias: github.com/openshift/origin - rerun_command: /test e2e-gcp-ovn-usernamespace - 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 - - --oauth-token-path=/usr/local/github-credentials/oauth - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-gcp-ovn-usernamespace - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /usr/local/github-credentials - name: github-credentials-openshift-ci-robot-private-git-cloner - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-ovn-usernamespace,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml index c8eac4824c44f..e12672caace23 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml @@ -4221,87 +4221,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(e2e-gcp-ovn-upgrade|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build08 - context: ci/prow/e2e-gcp-ovn-usernamespace - decorate: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-gcp - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-origin-main-e2e-gcp-ovn-usernamespace - optional: true - rerun_command: /test e2e-gcp-ovn-usernamespace - 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=/secrets/ci-pull-credentials - - --target=e2e-gcp-ovn-usernamespace - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-ovn-usernamespace,?($|\s.*) - agent: kubernetes always_run: false branches: