Skip to content

Commit

Permalink
Merge branch 'main' into inject-build-pgo-profile
Browse files Browse the repository at this point in the history
  • Loading branch information
1pkg committed Sep 10, 2024
2 parents eed7373 + d8ce411 commit 7cd274f
Show file tree
Hide file tree
Showing 38 changed files with 513 additions and 328 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ scms:
kind: github
spec:
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: elastic
repository: apm-server
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: '{{ requiredEnv "BRANCH" }}'
commitusingapi: true
Expand Down
5 changes: 3 additions & 2 deletions .ci/bump-golang.yml → .ci/updatecli/bump-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ scms:
kind: github
spec:
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: elastic
repository: apm-server
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: '{{ requiredEnv "GITHUB_BRANCH" }}'
commitusingapi: true
Expand Down
5 changes: 3 additions & 2 deletions .ci/update-beats.yml → .ci/updatecli/update-beats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ scms:
kind: github
spec:
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: elastic
repository: apm-server
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: '{{ requiredEnv "BRANCH_NAME" }}'
commitusingapi: true
Expand Down
2 changes: 2 additions & 0 deletions .ci/updatecli/values.d/ironbank.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config:
- path: packaging/ironbank
10 changes: 10 additions & 0 deletions .ci/updatecli/values.d/scm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
scm:
enabled: true
owner: elastic
repository: apm-server
branch: main
commitusingapi: true
# begin updatecli-compose policy values
user: obltmachine
email: [email protected]
# end updatecli-compose policy values
3 changes: 3 additions & 0 deletions .ci/updatecli/values.d/updatecli-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
spec:
files:
- "updatecli-compose.yaml"
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ jobs:

# Notify result to Slack only on schedule (nightly run)
- if: github.event_name == 'schedule'
uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/bump-elastic-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1

bump-elastic-stack:
runs-on: ubuntu-latest
Expand All @@ -30,15 +30,15 @@ jobs:
with:
ref: ${{ matrix.branch }}

- uses: elastic/oblt-actions/updatecli/run@v1.9.1
- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: --experimental apply --config .ci/bump-elastic-stack-snapshot.yml
command: --experimental apply --config .ci/updatecli/bump-elastic-stack-snapshot.yml --values .ci/updatecli/values.d/scm.yml
env:
BRANCH: ${{ matrix.branch }}
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}

- if: ${{ failure() }}
uses: elastic/oblt-actions/slack/send@v1.9.1
uses: elastic/oblt-actions/slack/send@v1
with:
channel-id: '#apm-server'
message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/bump-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- id: generate
name: Generate matrix
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1
with:
exclude-branches: '7.17,main'
- uses: actions/github-script@v7
Expand All @@ -41,9 +41,9 @@ jobs:

- uses: actions/checkout@v4

- uses: elastic/oblt-actions/updatecli/run@v1.9.1
- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: --experimental apply --config .ci/bump-golang.yml
command: --experimental apply --config .ci/updatecli/bump-golang.yml --values .ci/updatecli/values.d/scm.yml
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
GITHUB_BRANCH: 'main'
Expand All @@ -56,9 +56,9 @@ jobs:
with:
ref: '7.17'

- uses: elastic/oblt-actions/updatecli/run@v1.9.1
- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: --experimental apply --config .ci/bump-golang.yml
command: --experimental apply --config .ci/updatecli/bump-golang.yml --values .ci/updatecli/values.d/scm.yml
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}
GITHUB_BRANCH: '7.17'
Expand All @@ -70,11 +70,11 @@ jobs:
if: always()
steps:
- id: check
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
uses: elastic/oblt-actions/check-dependent-jobs@v1
with:
needs: ${{ toJSON(needs) }}
jobs: ${{ toJSON(needs) }}
- if: ${{ steps.check.outputs.isSuccess == 'false' }}
uses: elastic/oblt-actions/slack/send@v1.9.1
uses: elastic/oblt-actions/slack/send@v1
with:
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
channel-id: "#apm-server"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1

check-docker-compose:
needs:
Expand Down Expand Up @@ -47,9 +47,9 @@ jobs:
- check-docker-compose
steps:
- id: check
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
uses: elastic/oblt-actions/check-dependent-jobs@v1
with:
needs: ${{ toJSON(needs) }}
jobs: ${{ toJSON(needs) }}
- run: ${{ steps.check.outputs.isSuccess }}
- if: failure()
uses: elastic/oblt-actions/slack/notify-result@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c # v44.5.7
uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 # v45.0.1
with:
files: .go-version

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/smoke-tests-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- id: generate
name: Generate matrix
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1
with:
exclude-branches: '7.17'

Expand Down Expand Up @@ -57,9 +57,9 @@ jobs:
- smoke-tests-ess
steps:
- id: check
uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
uses: elastic/oblt-actions/check-dependent-jobs@v1
with:
needs: ${{ toJSON(needs) }}
jobs: ${{ toJSON(needs) }}
- uses: elastic/oblt-actions/slack/[email protected]
with:
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-beats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current
uses: elastic/oblt-actions/elastic/active-branches@v1
bump:
needs:
- filter
Expand All @@ -33,15 +33,15 @@ jobs:
with:
go-version-file: go.mod

- uses: elastic/oblt-actions/updatecli/run@v1.9.1
- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: --experimental apply --config .ci/update-beats.yml
command: --experimental apply --config .ci/updatecli/update-beats.yml --values .ci/updatecli/values.d/scm.yml
env:
BRANCH_NAME: ${{ matrix.branch }}
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}

- if: ${{ failure() }}
uses: elastic/oblt-actions/slack/send@v1.9.1
uses: elastic/oblt-actions/slack/send@v1
with:
channel-id: '#apm-server'
message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/update-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
name: update-compose

on:
workflow_dispatch:
schedule:
- cron: '0 6 * * *'

permissions:
contents: read

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

- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.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 compose apply
env:
GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }}

- if: ${{ failure() }}
uses: elastic/oblt-actions/slack/send@v1
with:
channel-id: '#apm-server'
message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>"
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.0
1.23.1
Loading

0 comments on commit 7cd274f

Please sign in to comment.