Remove redundant OLS CI tests

- All scenarios are covered in e2e-ols-cluster step. - Replace periodic tests with one e2e-cluster test.
openshift · Apr 30, 2024 · 80548ee · 80548ee
1 parent 372db3f
commit 80548ee
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 559 deletions.
diff --git a/ci-operator/config/openshift/lightspeed-service/openshift-lightspeed-service-main.yaml b/ci-operator/config/openshift/lightspeed-service/openshift-lightspeed-service-main.yaml
@@ -49,95 +49,9 @@ tests:
   secret:
     mount_path: /tmp/secret
     name: ols-codecov-token
-- always_run: false
-  as: e2e-ols-azure-openai-gpt35
-  cron: '@daily'
-  presubmit: true
-  run_if_changed: ^(Containerfile.*|Makefile|manifests/.*|ols/.*|pyproject.toml|pdm.lock|scripts/.*|tests/.*)$
-  steps:
-    test:
-    - as: e2e
-      commands: |
-        export PROVIDER_KEY_PATH=/var/run/azureopenai/token
-        export PROVIDER=azure_openai
-        export PROVIDER_URL=https://ols-test.openai.azure.com/
-        export PROVIDER_DEPLOYMENT_NAME=0301-dep
-        export MODEL=gpt-3.5-turbo
-        tests/scripts/test-e2e-standalone.sh
-      credentials:
-      - mount_path: /var/run/azureopenai
-        name: azureopenai-apitoken
-        namespace: test-credentials
-      from: src
-      grace_period: 5ns
-      resources:
-        requests:
-          cpu: 100m
-- as: e2e-ols-bam-granite13b-chat-v2
-  cron: '@daily'
-  presubmit: true
-  run_if_changed: ^(Containerfile.*|Makefile|manifests/.*|ols/.*|pyproject.toml|pdm.lock|scripts/.*|tests/.*)$
-  steps:
-    test:
-    - as: e2e
-      commands: |
-        export PROVIDER_KEY_PATH=/var/run/bam/token
-        export PROVIDER=bam
-        export MODEL=ibm/granite-13b-chat-v2
-        tests/scripts/test-e2e-standalone.sh
-      credentials:
-      - mount_path: /var/run/bam
-        name: bam-apitoken
-        namespace: test-credentials
-      from: src
-      grace_period: 5ns
-      resources:
-        requests:
-          cpu: 100m
-- always_run: false
-  as: e2e-ols-openai-gpt35
-  cron: '@daily'
-  presubmit: true
-  steps:
-    test:
-    - as: e2e
-      commands: |
-        export PROVIDER_KEY_PATH=/var/run/openai/token
-        export PROVIDER=openai
-        export MODEL=gpt-3.5-turbo
-        tests/scripts/test-e2e-standalone.sh
-      credentials:
-      - mount_path: /var/run/openai
-        name: openai-apitoken
-        namespace: test-credentials
-      from: src
-      grace_period: 5ns
-      resources:
-        requests:
-          cpu: 100m
-- always_run: false
-  as: e2e-ols-watsonx-granite13b-chat-v2
-  cron: '@daily'
-  presubmit: true
-  steps:
-    test:
-    - as: e2e
-      commands: |
-        export PROVIDER_KEY_PATH=/var/run/watsonx/token
-        export PROVIDER=watsonx
-        export PROVIDER_PROJECT_ID=ad629765-c373-4731-9d69-dc701724c081
-        export MODEL=ibm/granite-13b-chat-v2
-        tests/scripts/test-e2e-standalone.sh
-      credentials:
-      - mount_path: /var/run/watsonx
-        name: watsonx-apitoken
-        namespace: test-credentials
-      from: src
-      grace_period: 5ns
-      resources:
-        requests:
-          cpu: 100m
 - as: e2e-ols-cluster
+  cron: 10 2 * * *
+  presubmit: true
   run_if_changed: ^(Containerfile.*|Makefile|manifests/.*|ols/.*|pyproject.toml|pdm.lock|scripts/.*|tests/.*)$
   steps:
     cluster_profile: aws-2

diff --git a/...erator/jobs/openshift/lightspeed-service/openshift-lightspeed-service-main-periodics.yaml b/...erator/jobs/openshift/lightspeed-service/openshift-lightspeed-service-main-periodics.yaml
@@ -1,76 +1,6 @@
 periodics:
 - agent: kubernetes
-  cluster: build05
-  cron: 43 23 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: lightspeed-service
-  labels:
-    ci.openshift.io/generator: prowgen
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-lightspeed-service-main-e2e-ols-azure-openai-gpt35
-  reporter_config:
-    slack:
-      channel: '#forum-ocp-lightspeed'
-      job_states_to_report:
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-        :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> :volcano: {{end}}'
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-ols-azure-openai-gpt35
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - 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: 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
-- agent: kubernetes
-  cluster: build05
+  cluster: build03
   cron: 10 2 * * *
   decorate: true
   decoration_config:
@@ -80,27 +10,21 @@ periodics:
     org: openshift
     repo: lightspeed-service
   labels:
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: aws-2
     ci.openshift.io/generator: prowgen
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-lightspeed-service-main-e2e-ols-bam-granite13b-chat-v2
-  reporter_config:
-    slack:
-      channel: '#forum-ocp-lightspeed'
-      job_states_to_report:
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-        :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> :volcano: {{end}}'
+  name: periodic-ci-openshift-lightspeed-service-main-e2e-ols-cluster
   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-ols-bam-granite13b-chat-v2
+      - --secret-dir=/usr/local/e2e-ols-cluster-cluster-profile
+      - --target=e2e-ols-cluster
       command:
       - ci-operator
       image: ci-operator:latest
@@ -110,79 +34,14 @@ periodics:
         requests:
           cpu: 10m
       volumeMounts:
-      - 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
+      - mountPath: /etc/boskos
+        name: boskos
         readOnly: true
-    serviceAccountName: ci-operator
-    volumes:
-    - 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
-- agent: kubernetes
-  cluster: build05
-  cron: 1 23 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: lightspeed-service
-  labels:
-    ci.openshift.io/generator: prowgen
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-lightspeed-service-main-e2e-ols-openai-gpt35
-  reporter_config:
-    slack:
-      channel: '#forum-ocp-lightspeed'
-      job_states_to_report:
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-        :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> :volcano: {{end}}'
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-ols-openai-gpt35
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
       - mountPath: /secrets/ci-pull-credentials
         name: ci-pull-credentials
         readOnly: true
+      - mountPath: /usr/local/e2e-ols-cluster-cluster-profile
+        name: cluster-profile
       - mountPath: /secrets/gcs
         name: gcs-credentials
         readOnly: true
@@ -197,79 +56,18 @@ periodics:
         readOnly: true
     serviceAccountName: ci-operator
     volumes:
-    - 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
+    - name: boskos
       secret:
-        secretName: result-aggregator
-- agent: kubernetes
-  cluster: build05
-  cron: 58 2 * * *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: main
-    org: openshift
-    repo: lightspeed-service
-  labels:
-    ci.openshift.io/generator: prowgen
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-lightspeed-service-main-e2e-ols-watsonx-granite13b-chat-v2
-  reporter_config:
-    slack:
-      channel: '#forum-ocp-lightspeed'
-      job_states_to_report:
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}}
-        :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> :volcano: {{end}}'
-  spec:
-    containers:
-    - args:
-      - --gcs-upload-secret=/secrets/gcs/service-account.json
-      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-      - --report-credentials-file=/etc/report/credentials
-      - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-ols-watsonx-granite13b-chat-v2
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      resources:
-        requests:
-          cpu: 10m
-      volumeMounts:
-      - 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:
+        items:
+        - key: credentials
+          path: credentials
+        secretName: boskos-credentials
     - name: ci-pull-credentials
       secret:
         secretName: ci-pull-credentials
+    - name: cluster-profile
+      secret:
+        secretName: cluster-secrets-aws-2
     - name: manifest-tool-local-pusher
       secret:
         secretName: manifest-tool-local-pusher