Use builder image with new openssl version

ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.28.yaml

@@ -34,12 +34,12 @@ tests:
     XDG_CACHE_HOME="/tmp/cache"
   container:
     from: src
-- as: unit-and-gencheck
+- as: unit
   steps:
     cluster_profile: ossm-aws
     env:
       BASE_DOMAIN: servicemesh.devcluster.openshift.com
-      MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:release-1.28-2cff97d3b27d82d78c5d4e468a467f520cf2fbf3
+      MAISTRA_BUILDER_IMAGE: quay.io/maistra-dev/maistra-builder:3.3
       MAISTRA_NAMESPACE: maistra-e2e-test
       MAISTRA_SC_POD: maistra-e2e-test-sc-pod
     test:
@@ -57,20 +57,16 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 20m0s
-    - as: gencheck
+    - as: unit
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
           bash -c "\
           export BUILD_WITH_CONTAINER=0 && \
-          export GOBIN='/gobin' && \
-          export GOCACHE='/tmp/cache' && \
-          export GOMODCACHE='/tmp/cache' && \
-          export XDG_CACHE_HOME='/tmp/cache' && \
-          export ARTIFACTS='${ARTIFACT_DIR}' && \
           cd /work && \
           entrypoint \
-          make gen-check"
+          make -e T=-v build racetest binaries-test"
+        oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
       - name: MAISTRA_SC_POD
@@ -79,17 +75,45 @@ tests:
         requests:
           cpu: 100m
           memory: 100Mi
-      timeout: 1h0m0s
-    - as: unit
+      timeout: 3h0m0s
+    workflow: servicemesh-istio-e2e-profile
+- as: gencheck
+  steps:
+    cluster_profile: ossm-aws
+    env:
+      BASE_DOMAIN: servicemesh.devcluster.openshift.com
+      MAISTRA_BUILDER_IMAGE: gcr.io/istio-testing/build-tools:release-1.28-2cff97d3b27d82d78c5d4e468a467f520cf2fbf3
+      MAISTRA_NAMESPACE: maistra-e2e-test
+      MAISTRA_SC_POD: maistra-e2e-test-sc-pod
+    test:
+    - as: copy-src
+      cli: latest
+      commands: |
+        # SRC_PATH does end with /. : the content of the source directory is copied into dest directory
+        oc cp ./. "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":/work/
+      env:
+      - name: MAISTRA_NAMESPACE
+      - name: MAISTRA_SC_POD
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 100Mi
+      timeout: 20m0s
+    - as: gencheck
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
           bash -c "\
           export BUILD_WITH_CONTAINER=0 && \
+          export GOBIN='/gobin' && \
+          export GOCACHE='/tmp/cache' && \
+          export GOMODCACHE='/tmp/cache' && \
+          export XDG_CACHE_HOME='/tmp/cache' && \
+          export ARTIFACTS='${ARTIFACT_DIR}' && \
           cd /work && \
           entrypoint \
-          make -e T=-v build racetest binaries-test"
-        oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
+          make gen-check"
       env:
       - name: MAISTRA_NAMESPACE
       - name: MAISTRA_SC_POD
@@ -98,7 +122,7 @@ tests:
         requests:
           cpu: 100m
           memory: 100Mi
-      timeout: 3h0m0s
+      timeout: 1h0m0s
     workflow: servicemesh-istio-e2e-profile
 - as: integ-helm
   steps:

ci-operator/jobs/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.28-presubmits.yaml

@@ -1,5 +1,87 @@
 presubmits:
   openshift-service-mesh/istio:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-1\.28$
+    - ^release-1\.28-
+    cluster: build03
+    context: ci/prow/gencheck
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: ossm-aws
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-service-mesh-istio-release-1.28-gencheck
+    rerun_command: /test gencheck
+    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=gencheck
+        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( | .* )gencheck,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -479,7 +561,7 @@ presubmits:
     - ^release-1\.28$
     - ^release-1\.28-
     cluster: build03
-    context: ci/prow/unit-and-gencheck
+    context: ci/prow/unit
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -488,8 +570,8 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: ossm-aws
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-service-mesh-istio-release-1.28-unit-and-gencheck
-    rerun_command: /test unit-and-gencheck
+    name: pull-ci-openshift-service-mesh-istio-release-1.28-unit
+    rerun_command: /test unit
     spec:
       containers:
       - args:
@@ -498,7 +580,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=unit-and-gencheck
+        - --target=unit
         command:
         - ci-operator
         env:
@@ -554,4 +636,4 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit-and-gencheck,?($|\s.*)
+    trigger: (?m)^/test( | .* )unit,?($|\s.*)