Skip to content

Define instance type for logging #14353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 15, 2020
+30 −0
Merged

Define instance type for logging #14353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .../config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,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: CLUSTER_NODE_TYPE
Copy link
Member

@wking wking Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this PR merged before many of the rehearsals had completed, but I'd expect you'd need to also set some other environment variables to avoid clearing them. See #14184 for similar recovery. I have an internal ticket open with DPTP about rendering convenient docs for available environment variables here and similar. Anyhow, if your CI is doing what you want, you can ignore this. But if the jobs start behaving strangely, this may be why (and next time you may want to wait out the rehearsals and review their success before merging the release PR ;).

Copy link
Contributor Author

@jcantrill jcantrill Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this PR merged before many of the rehearsals had completed, but I'd expect you'd need to also set some other environment variables to avoid clearing them.

Do we have any idea what might need to be set or is this simply trial and error?

from: stable:cluster-logging-operator-e2e
resources:
requests:
Expand All @@ -93,6 +96,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: CLUSTER_NODE_TYPE
from: stable:cluster-logging-operator-e2e
resources:
requests:
Expand Down
6 changes: 6 additions & 0 deletions ...ator/config/openshift/elasticsearch-operator/openshift-elasticsearch-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ tests:
- as: test
cli: latest
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
from: src
resources:
requests:
Expand All @@ -78,6 +81,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: CLUSTER_NODE_TYPE
from: stable:cluster-logging-operator-e2e
resources:
requests:
Expand Down
6 changes: 6 additions & 0 deletions ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,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: CLUSTER_NODE_TYPE
from: stable:cluster-logging-operator-e2e
resources:
requests:
Expand All @@ -68,6 +71,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: CLUSTER_NODE_TYPE
from: stable:elasticsearch-operator-src
resources:
requests:
Expand Down
12 changes: 12 additions & 0 deletions ...onfig/openshift/origin-aggregated-logging/openshift-origin-aggregated-logging-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ tests:
- as: test
cli: latest
commands: make test
env:
- default: m5.4xlarge
name: CLUSTER_NODE_TYPE
from: stable:origin-aggregated-logging-tests
resources:
requests:
Expand All @@ -104,6 +107,9 @@ tests:
- as: test
cli: latest
commands: make test-e2e-olm
env:
- default: m5.4xlarge
name: CLUSTER_NODE_TYPE
from: stable:elasticsearch-operator-src
resources:
requests:
Expand All @@ -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: CLUSTER_NODE_TYPE
from: stable:cluster-logging-operator-e2e
resources:
requests:
Expand All @@ -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: CLUSTER_NODE_TYPE
from: stable:cluster-logging-operator-e2e
resources:
requests:
Expand Down