Skip to content

Commit

Permalink
updatecli: move to the .github folder and support for signed commits (#…
Browse files Browse the repository at this point in the history
…39472)

(cherry picked from commit 46de7e0)

# Conflicts:
#	.github/workflows/bump-elastic-stack-snapshot.yml
#	.github/workflows/bump-golang.yml
#	.github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml
#	.github/workflows/updatecli.d/bump-golang-7.17.yml
  • Loading branch information
v1v authored and mergify[bot] committed May 15, 2024
1 parent 9f5bd5a commit a17dc7f
Show file tree
Hide file tree
Showing 6 changed files with 355 additions and 16 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/bump-elastic-stack-snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: bump-elastic-stack-snapshot

on:
workflow_dispatch:
schedule:
- cron: '0 15 * * 1-5'

permissions:
contents: read

jobs:
filter:
runs-on: ubuntu-latest
timeout-minutes: 1
outputs:
matrix: ${{ steps.generator.outputs.matrix }}
steps:
- id: generator
uses: elastic/apm-pipeline-library/.github/actions/elastic-stack-snapshot-branches@current

bump-elastic-stack:
runs-on: ubuntu-latest
needs: [filter]
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
steps:
- uses: actions/checkout@v4

- uses: elastic/apm-pipeline-library/.github/actions/updatecli@current
with:
vaultUrl: ${{ secrets.VAULT_ADDR }}
vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
pipeline: .github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml
values: .github/workflows/updatecli.d/scm.yml
command: '--experimental apply'
notifySlackChannel: "#ingest-notifications"
messageIfFailure: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@update-me-with-the-slack-team-to-be-poked` please look what's going on <${{ env.JOB_URL }}|here>"
env:
BRANCH: ${{ matrix.branch }}
31 changes: 28 additions & 3 deletions .github/workflows/bump-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,44 @@ on:
permissions:
contents: read

env:
JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"

jobs:
bump:
runs-on: ubuntu-latest
steps:
<<<<<<< HEAD

- uses: actions/checkout@v3
=======
- uses: actions/checkout@v4
>>>>>>> 46de7e07de (updatecli: move to the .github folder and support for signed commits (#39472))

- uses: elastic/apm-pipeline-library/.github/actions/updatecli@current
with:
vaultUrl: ${{ secrets.VAULT_ADDR }}
vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
<<<<<<< HEAD
pipeline: ./.ci/bump-golang.yml
=======
pipeline: .github/workflows/updatecli.d/bump-golang.yml
values: .github/workflows/updatecli.d/scm.yml
command: '--experimental apply'
notifySlackChannel: "#ingest-notifications"
messageIfFailure: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@update-me-with-the-slack-team-to-be-poked` please look what's going on <${{ env.JOB_URL }}|here>"

bump-7-17:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: elastic/apm-pipeline-library/.github/actions/updatecli@current
with:
vaultUrl: ${{ secrets.VAULT_ADDR }}
vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
pipeline: .github/workflows/updatecli.d/bump-golang-7.17.yml
values: .github/workflows/updatecli.d/scm.yml
command: '--experimental apply'
notifySlackChannel: "#ingest-notifications"
messageIfFailure: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@update-me-with-the-slack-team-to-be-poked` please look what's going on <${{ env.JOB_URL }}|here>"
>>>>>>> 46de7e07de (updatecli: move to the .github folder and support for signed commits (#39472))
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@ actions:
default:
title: '[updatecli] update elastic stack version for testing {{ source "latestVersion" }}'
kind: github/pullrequest
scmid: default
spec:
labels:
- automation
- dependency
- backport-skip
- build-monitoring
- Team:Beats-On-Call
<<<<<<< HEAD:.ci/bump-elastic-stack-snapshot.yml
scmid: default
=======
>>>>>>> 46de7e07de (updatecli: move to the .github folder and support for signed commits (#39472)):.github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml

scms:
default:
kind: github
spec:
user: '{{ requiredEnv "GIT_USER" }}'
email: '{{ requiredEnv "GIT_EMAIL" }}'
owner: elastic
repository: beats
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
username: '{{ requiredEnv "GIT_USER" }}'
branch: '{{ requiredEnv "BRANCH" }}'
commitusingapi: true

sources:
latestVersion:
Expand Down
269 changes: 269 additions & 0 deletions .github/workflows/updatecli.d/bump-golang-7.17.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
---
name: Bump golang-version to latest version in 7.17
pipelineid: "bump-golang-version-7.17"

scms:
githubConfig:
kind: github
spec:
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: "7.17"
commitusingapi: true

actions:
beats:
kind: github/pullrequest
scmid: githubConfig
sourceid: latestGoVersion
title: '[Automation][7.17] Bump Golang version to {{ source "latestGoVersion" }}'
spec:
labels:
- dependencies
- backport-skip

sources:
minor:
name: Get minor version in .go-version
kind: shell
transformers:
- findsubmatch:
pattern: '^\d+.(\d+).\d+$'
captureindex: 1
spec:
command: cat .go-version

latestGoVersion:
name: Get Latest Go Release
kind: githubrelease
dependson:
- minor
transformers:
- trimprefix: v
spec:
owner: elastic
repository: golang-crossbuild
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
username: '{{ requiredEnv "GIT_USER" }}'
versionfilter:
kind: regex
pattern: v1\.{{ source "minor" }}\.(\d*)$

gomod:
dependson:
- latestGoVersion
name: Get version in go.mod format
kind: shell
transformers:
- findsubmatch:
pattern: '^(\d+.\d+).\d+'
captureindex: 1
spec:
command: echo {{ source "latestGoVersion" }}

conditions:
dockerTag:
name: Is docker image golang:{{ source "latestGoVersion" }} published
kind: dockerimage
spec:
image: golang
tag: '{{ source "latestGoVersion" }}'
sourceid: latestGoVersion

goDefaultVersion-check:
name: Check if defined golang version differs
kind: shell
sourceid: latestGoVersion
spec:
command: 'grep -v -q {{ source "latestGoVersion" }} .go-version #'

targets:
update-gomod:
name: "Update go.mod"
sourceid: gomod
scmid: githubConfig
kind: file
spec:
content: 'go {{ source "gomod" }}'
file: go.mod
matchpattern: 'go \d+.\d+'
update-go-version:
name: "Update .go-version"
sourceid: latestGoVersion
scmid: githubConfig
kind: file
spec:
content: '{{ source "latestGoVersion" }}'
file: .go-version
matchpattern: '\d+.\d+.\d+'
update-golang.ci:
name: "Update .golangci.yml"
sourceid: latestGoVersion
scmid: githubConfig
kind: file
spec:
content: '{{ source "latestGoVersion" }}'
file: .golangci.yml
matchpattern: '\d+.\d+.\d+'
update-version.asciidoc:
name: "Update version.asciidoc"
sourceid: latestGoVersion
scmid: githubConfig
kind: file
spec:
content: ':go-version: {{ source "latestGoVersion" }}'
file: libbeat/docs/version.asciidoc
matchpattern: ':go-version: \d+.\d+.\d+'
update-auditbeat-dockerfile:
name: "Update Auditbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./auditbeat/Dockerfile
update-heartbeat-dockerfile:
name: "Update Heartbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./heartbeat/Dockerfile
update-metricbeat-dockerfile:
name: "Update Metricbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./metricbeat/Dockerfile
update-packetbeat-dockerfile:
name: "Update Packetbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./packetbeat/Dockerfile
update-functionbeat-dockerfile:
name: "Update Functionbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./x-pack/functionbeat/Dockerfile
update-nats-module-dockerfile:
name: "Update NATS module Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./metricbeat/module/nats/_meta/Dockerfile
update-http-module-dockerfile:
name: "Update HTTP module Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./metricbeat/module/http/_meta/Dockerfile
update-vsphere-module-dockerfile:
name: "Update from vsphere Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./metricbeat/module/vsphere/_meta/Dockerfile
update-metricbeat-debug-dockerfile:
name: "Update Metricbeat debug Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./dev-tools/kubernetes/metricbeat/Dockerfile.debug
update-dockerfiles-filebeat-debug:
name: "Update Filebeat debug Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./dev-tools/kubernetes/filebeat/Dockerfile.debug
update-heartbeat-debug-dockerfile:
name: "Update Heartbeat debug Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./dev-tools/kubernetes/heartbeat/Dockerfile.debug
update-stan-module-dockerfile:
name: "Update stan Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./x-pack/metricbeat/module/stan/_meta/Dockerfile
# The following Dockerfiles aren't present on the main branch, this is the main reason we have a separate job
update-filebeat-dockerfile:
name: "Update Filebeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./filebeat/Dockerfile
update-libbeat-dockerfile:
name: "Update libbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./libbeat/Dockerfile
update-x-pack-libbeat-dockerfile:
name: "Update x-pack/libbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./x-pack/libbeat/Dockerfile
Loading

0 comments on commit a17dc7f

Please sign in to comment.