diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml index 619fb1f6ac294..bc131fbc9cd03 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml @@ -82,7 +82,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -98,7 +98,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-functional env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.5.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.5.yaml index 499498f148f3e..a86590d0b50df 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.5.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.5.yaml @@ -53,6 +53,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.6.yaml index 2c275de75c1b3..e348fda1294f1 100644 --- a/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-release-4.6.yaml @@ -72,6 +72,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml index 4ca97cb5bf463..6c4d30faf30d2 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml @@ -68,7 +68,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/eo-logs ARTIFACT_DIR=${ARTIFACT_DIR}/eo-artifacts make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: src resources: requests: @@ -83,7 +83,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.5.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.5.yaml index 13820336c9736..a7dcd5920d9b8 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.5.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.5.yaml @@ -48,6 +48,9 @@ tests: - as: test cli: latest commands: make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: src resources: requests: @@ -60,6 +63,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -72,6 +78,9 @@ tests: - as: test cli: latest commands: hack/testing-olm-upgrade/test-020-olm-upgrade-4.4-4.5.sh + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: src resources: requests: diff --git a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.6.yaml b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.6.yaml index 3e4126715c7f6..f1aeb40a43a29 100644 --- a/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-release-4.6.yaml @@ -60,6 +60,9 @@ tests: - as: test cli: latest commands: make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: src resources: requests: @@ -72,6 +75,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml index 40e1a89c35d08..ce5920738cdec 100644 --- a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml +++ b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml @@ -58,7 +58,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -73,7 +73,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:elasticsearch-operator-src resources: requests: diff --git a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.5.yaml b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.5.yaml index c378867ae88de..f91c99167b035 100644 --- a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.5.yaml +++ b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.5.yaml @@ -42,6 +42,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -54,6 +57,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:elasticsearch-operator-src resources: requests: diff --git a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.6.yaml b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.6.yaml index d1c2d3272e4c4..cc1f67dfa2e08 100644 --- a/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.6.yaml +++ b/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-4.6.yaml @@ -51,6 +51,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -63,6 +66,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:elasticsearch-operator-src resources: requests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml index bcf43000bff87..2965d2ef27c20 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml @@ -94,7 +94,7 @@ tests: commands: make test env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:origin-aggregated-logging-tests resources: requests: @@ -109,7 +109,7 @@ tests: commands: make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:elasticsearch-operator-src resources: requests: @@ -124,7 +124,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -139,7 +139,7 @@ tests: commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-functional env: - default: m5.4xlarge - name: CLUSTER_NODE_TYPE + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.5.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.5.yaml index d087dc2cfe575..88bd01873f6b2 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.5.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.5.yaml @@ -80,6 +80,9 @@ tests: - as: test cli: latest commands: make test + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:origin-aggregated-logging-tests resources: requests: @@ -92,6 +95,9 @@ tests: - as: test cli: latest commands: make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:elasticsearch-operator-src resources: requests: @@ -104,6 +110,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: diff --git a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.6.yaml b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.6.yaml index 9653bc9a0dc30..2e0a54d08fdcf 100644 --- a/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.6.yaml +++ b/ci-operator/config/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-release-4.6.yaml @@ -92,6 +92,9 @@ tests: - as: test cli: latest commands: make test + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:origin-aggregated-logging-tests resources: requests: @@ -104,6 +107,9 @@ tests: - as: test cli: latest commands: make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:elasticsearch-operator-src resources: requests: @@ -116,6 +122,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-e2e-olm + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: @@ -128,6 +137,9 @@ tests: - as: test cli: latest commands: FAKE_HOME_DIR=/tmp/home LOG_DIR=/tmp/artifacts/logging-logs ARTIFACT_DIR=${ARTIFACT_DIR}/logging-artifacts make test-functional + env: + - default: m5.4xlarge + name: COMPUTE_NODE_TYPE from: stable:cluster-logging-operator-e2e resources: requests: