Skip to content
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

Jump to bottom

updatecli: use shared policy #3707

Merged
merged 2 commits into from
Jul 5, 2024
Merged

updatecli: use shared policy #3707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56f18d5
updatecli: use shared policy
v1v Jul 5, 2024
1209032
refactor
v1v Jul 5, 2024
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
83 changes: 0 additions & 83 deletions .ci/updatecli/updatecli.d/update-gherkin-specs.yml
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions .ci/updatecli/updatecli.d/update-json-specs.yml
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions .ci/updatecli/updatecli.d/update-specs.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .ci/updatecli/values.d/apm-data-spec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
apm_schema_specs_path: apm-agent-core/src/test/resources/apm-server-schema/current
signedcommit: true
2 changes: 2 additions & 0 deletions .ci/updatecli/values.d/apm-gherkin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
apm_gherkin_specs_path: apm-agent-core/src/test/resources/specs
signedcommit: true
2 changes: 2 additions & 0 deletions .ci/updatecli/values.d/apm-json-specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
apm_json_specs_path: apm-agent-core/src/test/resources/json-specs
signedcommit: true
6 changes: 6 additions & 0 deletions .ci/updatecli/values.d/scm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
scm:
enabled: true
owner: elastic
repository: apm-agent-java
apm_repository: apm
branch: main
14 changes: 0 additions & 14 deletions .ci/updatecli/values.yml
View file
Open in desktop

This file was deleted.

19 changes: 17 additions & 2 deletions .github/workflows/updatecli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,29 @@ permissions:
contents: read

jobs:
bump:
compose:
runs-on: ubuntu-latest
permissions:
contents: read
packages: read
steps:
- uses: actions/checkout@v4

- uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: --experimental compose diff
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}

- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: "--experimental apply --config .ci/updatecli/updatecli.d --values .ci/updatecli/values.yml"
command: --experimental compose apply
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}

Expand Down
18 changes: 18 additions & 0 deletions update-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
policies:
- name: Handle apm-data server specs
policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-data-spec:0.2.0@sha256:7069c0773d44a74c4c8103b4d9957b468f66081ee9d677238072fe11c4d2197c
values:
- .ci/updatecli/values.d/scm.yml
- .ci/updatecli/values.d/apm-data-spec.yml

- name: Handle apm gherkin specs
policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-gherkin:0.2.0@sha256:26a30ad2b98a6e4cb17fb88a28fa3277ced8ca862d6388943afaafbf8ee96e7d
values:
- .ci/updatecli/values.d/scm.yml
- .ci/updatecli/values.d/apm-gherkin.yml

- name: Handle apm json specs
policy: ghcr.io/elastic/oblt-updatecli-policies/apm/apm-json-specs:0.2.0@sha256:969a6d21eabd6ebea66cb29b35294a273d6dbc0f7da78589c416aedf08728e78
values:
- .ci/updatecli/values.d/scm.yml
- .ci/updatecli/values.d/apm-json-specs.yml
Loading