[openshift-logging] Declare compute node type for jobs

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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: