Merge pull request openshift#8442 from bparees/fixup

more fixes to logging periodic job
dmesser · Apr 21, 2020 · 7a838b1 · 7a838b1
2 parents 894063d + 68f128d
commit 7a838b1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml
@@ -6515,6 +6515,25 @@ periodics:
           make test-e2e-olm
       - name: TEST_IMAGESTREAM_TAG
         value: stable:cluster-logging-operator-e2e
+      - name: CONFIG_SPEC
+        value: |
+          resources:
+            '*':
+              limits:
+                memory: 4Gi
+              requests:
+                cpu: 100m
+                memory: 200Mi
+          tag_specification:
+            cluster: https://api.ci.openshift.org
+            name: "$(BRANCH)"
+            namespace: ocp
+          tests:
+          - as: e2e-operator
+            commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=/tmp/artifacts/logging-artifacts make test-e2e-olm
+            openshift_installer_custom_test_image:
+              cluster_profile: aws
+              from: stable:cluster-logging-operator-e2e
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""

diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml
@@ -6515,6 +6515,25 @@ periodics:
           make test-e2e-olm
       - name: TEST_IMAGESTREAM_TAG
         value: stable:cluster-logging-operator-e2e
+      - name: CONFIG_SPEC
+        value: |
+          resources:
+            '*':
+              limits:
+                memory: 4Gi
+              requests:
+                cpu: 100m
+                memory: 200Mi
+          tag_specification:
+            cluster: https://api.ci.openshift.org
+            name: "$(BRANCH)"
+            namespace: ocp
+          tests:
+          - as: e2e-operator
+            commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=/tmp/artifacts/logging-artifacts make test-e2e-olm
+            openshift_installer_custom_test_image:
+              cluster_profile: aws
+              from: stable:cluster-logging-operator-e2e
       image: ci-operator:latest
       imagePullPolicy: Always
       name: ""