Helm zstream expansion and remove FIPS config (openshift#58575)

Author: sg-rh

ci-operator/config/redhat-developer/helm/redhat-developer-helm-release-3.11__helm-ocp4.16-lp-interop.yaml

@@ -26,7 +26,7 @@ resources:
       memory: 200Mi
 tests:
 - as: helm-interop-aws
-  cron: 0 6 11 7 *
+  cron: 0 6 25 12 *
   steps:
     cluster_profile: aws-cspi-qe
     env:
@@ -57,7 +57,7 @@ tests:
           cpu: 100m
     workflow: firewatch-ipi-aws
 - as: helm-interop-ibmcloud
-  cron: 0 6 11 7 *
+  cron: 0 6 25 12 *
   steps:
     cluster_profile: ibmcloud-cspi-qe
     env:

ci-operator/config/redhat-developer/helm/redhat-developer-helm-release-3.11__helm-ocp4.17-lp-interop.yaml

@@ -13,22 +13,24 @@ images:
   to: helm
 releases:
   latest:
-    candidate:
+    prerelease:
       product: ocp
-      stream: nightly
-      version: "4.17"
+      version_bounds:
+        lower: 4.17.0-0
+        stream: 4-stable
+        upper: 4.18.0-0
 resources:
   '*':
     requests:
       cpu: 200m
       memory: 200Mi
 tests:
-- as: helm-interop-aws
-  cron: 0 6 11 2 *
+- as: helm-interop-ibmcloud
+  cron: 0 6 25 12 *
   steps:
-    cluster_profile: aws-cspi-qe
+    cluster_profile: ibmcloud-cspi-qe
     env:
-      BASE_DOMAIN: cspilp.interop.ccitredhat.com
+      BASE_DOMAIN: zstream.interop.ccitredhat.com
       FIREWATCH_CONFIG: |
         {
           "failure_rules":
@@ -37,11 +39,9 @@ tests:
               {"step": "helm-acceptance-test", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "HELM", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]}
             ]
         }
-      FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
+      FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/ibm-ipi/lp-interop.json
       FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.17-lp","self-managed-lp","helm-lp"]'
       FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
-      USER_TAGS: |
-        scenario helm
     test:
     - as: helm-acceptance-test
       commands: |
@@ -53,39 +53,7 @@ tests:
       resources:
         requests:
           cpu: 100m
-    workflow: firewatch-ipi-aws
-- as: helm-interop-aws-fips
-  cron: 0 6 11 2 *
-  steps:
-    cluster_profile: aws-cspi-qe
-    env:
-      BASE_DOMAIN: cspilp.interop.ccitredhat.com
-      FIPS_ENABLED: "true"
-      FIREWATCH_CONFIG: |
-        {
-          "failure_rules":
-            [
-              {"step": "helm-acceptance-test", "failure_type": "pod_failure", "classification": "Test Execution", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
-              {"step": "helm-acceptance-test", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "HELM", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]}
-            ]
-        }
-      FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
-      FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.17-lp","self-managed-lp","fips","helm-lp"]'
-      FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
-      USER_TAGS: |
-        scenario helm
-    test:
-    - as: helm-acceptance-test
-      commands: |
-        make -f openshift-ci/Makefile build test-acceptance
-        mv  acceptance-testing/.acceptance/results.xml acceptance-testing/.acceptance/junit_results.xml
-        cp -r acceptance-testing/.acceptance/junit_*.xml ${ARTIFACT_DIR}/
-        cp -r acceptance-testing/.acceptance/*.html ${ARTIFACT_DIR}/
-      from: helm
-      resources:
-        requests:
-          cpu: 100m
-    workflow: firewatch-ipi-aws
+    workflow: firewatch-ipi-ibmcloud
 zz_generated_metadata:
   branch: release-3.11
   org: redhat-developer

ci-operator/jobs/redhat-developer/helm/redhat-developer-helm-release-3.11-periodics.yaml

@@ -341,7 +341,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build10
-  cron: 0 6 11 7 *
+  cron: 0 6 25 12 *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -426,7 +426,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build10
-  cron: 0 6 11 7 *
+  cron: 0 6 25 12 *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -511,7 +511,7 @@ periodics:
         secretName: result-aggregator
 - agent: kubernetes
   cluster: build10
-  cron: 0 6 11 2 *
+  cron: 0 6 25 12 *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -520,99 +520,12 @@ periodics:
     org: redhat-developer
     repo: helm
   labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
-    ci-operator.openshift.io/variant: helm-ocp4.17-lp-interop
-    ci.openshift.io/generator: prowgen
-    job-release: "4.17"
-    pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-redhat-developer-helm-release-3.11-helm-ocp4.17-lp-interop-helm-interop-aws
-  reporter_config:
-    slack:
-      channel: '#helm-interop'
-      job_states_to_report:
-      - success
-      - failure
-      - error
-      report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
-        ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
-        Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
-        logs> {{end}}'
-  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=helm-interop-aws
-      - --variant=helm-ocp4.17-lp-interop
-      command:
-      - ci-operator
-      image: ci-operator:latest
-      imagePullPolicy: Always
-      name: ""
-      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
-- agent: kubernetes
-  cluster: build10
-  cron: 0 6 11 2 *
-  decorate: true
-  decoration_config:
-    skip_cloning: true
-  extra_refs:
-  - base_ref: release-3.11
-    org: redhat-developer
-    repo: helm
-  labels:
-    ci-operator.openshift.io/cloud: aws
-    ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
+    ci-operator.openshift.io/cloud: ibmcloud
+    ci-operator.openshift.io/cloud-cluster-profile: ibmcloud-cspi-qe
     ci-operator.openshift.io/variant: helm-ocp4.17-lp-interop
     ci.openshift.io/generator: prowgen
-    job-release: "4.17"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-redhat-developer-helm-release-3.11-helm-ocp4.17-lp-interop-helm-interop-aws-fips
+  name: periodic-ci-redhat-developer-helm-release-3.11-helm-ocp4.17-lp-interop-helm-interop-ibmcloud
   reporter_config:
     slack:
       channel: '#helm-interop'
@@ -632,7 +545,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=helm-interop-aws-fips
+      - --target=helm-interop-ibmcloud
       - --variant=helm-ocp4.17-lp-interop
       command:
       - ci-operator

ci-operator/jobs/redhat-developer/helm/redhat-developer-helm-release-3.11-presubmits.yaml

@@ -184,7 +184,6 @@ presubmits:
     labels:
       ci-operator.openshift.io/variant: helm-ocp4.17-lp-interop
       ci.openshift.io/generator: prowgen
-      job-release: "4.17"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-redhat-developer-helm-release-3.11-helm-ocp4.17-lp-interop-images
     rerun_command: /test helm-ocp4.17-lp-interop-images