Skip to content

Commit b33ad72

Browse files
committed
Merge branch 'feature/serverless-its-oblt-cli' into test/serverless-its-oblt-cli
* feature/serverless-its-oblt-cli: fix fix fix update
2 parents b9d1a3b + cd850d0 commit b33ad72

File tree

4 files changed

+38
-5
lines changed

4 files changed

+38
-5
lines changed

.buildkite/integration.pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ common:
2121
ELASTICSEARCH_HOST: ea-serverless-it-elasticsearch-hostname
2222
ELASTICSEARCH_PASSWORD: ea-serverless-it-elasticsearch-password
2323
ELASTICSEARCH_USERNAME: ea-serverless-it-elasticsearch-username
24-
KIBANA_HOST: ea-serverless-kibana-hostname
25-
KIBANA_USERNAME: ea-serverless-kibana-username
26-
KIBANA_PASSWORD: ea-serverless-kibana-password
24+
KIBANA_HOST: ea-serverless-it-kibana-hostname
25+
KIBANA_USERNAME: ea-serverless-it-kibana-username
26+
KIBANA_PASSWORD: ea-serverless-it-kibana-password
2727

2828
steps:
2929
- group: "Integration tests: packaging"

.github/workflows/serverless-project.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ jobs:
8181
- name: Set up Cloud SDK
8282
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a
8383

84+
# TODO: as soon as the oblt-framework supports elastic-observability-ci we can avoid this step.
8485
# NOTE:
8586
# * While runnning this workflow, it might cause some hiccups if a PR runs when rotating the secrets
86-
# * Secrets need to be created firstly gcloud secrets create otherwise gcloud secrets versions add will fail.
87+
# * Secrets need to be created firstly. gcloud secrets create otherwise gcloud secrets versions add will fail.
88+
# That's not an issue now, as we use the same secret name.
8789
- name: Rotate GCSM secrets
8890
env:
8991
GCP_PROJECT: "elastic-observability-ci"

.tool-versions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
mage 1.14.0
22
golang 1.24.0
33
terraform 1.9.3
4-
oblt-cli 7.18.1
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: enhancement
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Update OTel components to v0.127.0
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

0 commit comments

Comments
 (0)