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.

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

[CI] automate update-beats #5692

Merged
merged 5 commits into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
16 changes: 16 additions & 0 deletions .ci/scripts/update-beats.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env bash
#
# This script is executed by the automation we are putting in place
# and it requires the git add/commit commands.
#
set -euo pipefail

make update-beats
COMMIT_MESSAGE="Update to elastic/beats@$(go list -m -f {{.Version}} github.com/elastic/beats/... | cut -d- -f3)"

git checkout -b "update-beats-$(date "+%Y%m%d%H%M%S")"
git add go.mod go.sum NOTICE.txt
git diff --staged --quiet || git commit -m "$COMMIT_MESSAGE"
git --no-pager log -1

echo "You can now push and create a Pull Request"
104 changes: 104 additions & 0 deletions .ci/update-beats.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
// Licensed to Elasticsearch B.V. under one or more contributor
// license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright
// ownership. Elasticsearch B.V. licenses this file to you under
// the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

// https://apm-ci.elastic.co/job/apm-server/job/update-json-schema-mbp/

@Library('apm@current') _

pipeline {
agent { label 'linux && immutable' }
environment {
REPO = 'apm-server'
BASE_DIR = "src/github.com/elastic/${env.REPO}"
HOME = "${env.WORKSPACE}"
NOTIFY_TO = credentials('notify-to')
JOB_GCS_BUCKET = credentials('gcs-bucket')
JOB_GIT_CREDENTIALS = "f6c7695a-671e-4f4f-a331-acdce44ff9ba"
PIPELINE_LOG_LEVEL = 'INFO'
}
triggers {
// Only master branch will run on a timer basis
cron(env.BRANCH_NAME == 'master' ? 'H H(4-5) * * 1,5' : '')
}
options {
timeout(time: 1, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '5'))
timestamps()
ansiColor('xterm')
disableResume()
durabilityHint('PERFORMANCE_OPTIMIZED')
}
parameters {
booleanParam(name: 'DRY_RUN_MODE', defaultValue: true, description: 'If true, allows to execute this pipeline in dry run mode, without sending a PR.')
v1v marked this conversation as resolved.
Show resolved Hide resolved
}
stages {
stage('Checkout'){
steps {
deleteDir()
gitCheckout(basedir: "${BASE_DIR}", repo: "git@github.com:elastic/${REPO}.git", credentialsId: "${JOB_GIT_CREDENTIALS}")
}
}
stage('Update beats') {
options { skipDefaultCheckout() }
steps {
dir("${BASE_DIR}"){
withGoEnv(){
setupAPMGitEmail(global: true)
sh(label: 'make update-beats', script: '.ci/scripts/update-beats.sh')
}
}
}
}
stage('Send Pull Request'){
options { skipDefaultCheckout() }
steps {
dir("${BASE_DIR}"){
createPullRequest()
}
}
}
}
post {
cleanup {
notifyBuildResult(prComment: false)
}
}
}

def createPullRequest(Map args = [:]) {
def title = '[automation] update libbeat and beats packaging'
def message = createPRDescription()
def labels = "automation"
if (params.DRY_RUN_MODE) {
log(level: 'INFO', text: "DRY-RUN: createPullRequest(labels: ${labels}, message: '${message}')")
return
}
def branchName = (isPR()) ? env.CHANGE_TARGET : env.BRANCH_NAME
if (anyChangesToBeSubmitted("${branchName}")) {
githubCreatePullRequest(title: "${title}", labels: "${labels}", description: "${message}", base: "${branchName}")
} else {
log(level: 'INFO', text: "There are no changes to be submitted.")
}
}

def anyChangesToBeSubmitted(String branch) {
return sh(returnStatus: true, script: "git diff --quiet HEAD..${branch}") != 0
}

def createPRDescription() {
return """### What \n Update with libbeat and beats packaging."""
}
33 changes: 28 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,34 @@ pull_request_rules:
merge:
method: squash
strict: smart+fasttrack
- name: delete upstream branch after merging changes on docker-compose.yml
- name: delete upstream branch with changes on docker-compose.yml after merging/closing it
conditions:
- merged
- label=automation
- head~=^update-stack-version
- files=docker-compose.yml
- or:
- merged
- closed
- and:
- label=automation
- head~=^update-.*-version
- files=docker-compose.yml
actions:
delete_head_branch:
- name: automatic merge when CI passes for the make update-beats
conditions:
- check-success=apm-ci/pr-merge
- label=automation
- base~=^update-beats
- files~=^(go.mod|go.sum|NOTICE.txt)
actions:
merge:
method: squash
strict: smart+fasttrack
- name: delete upstream branch after merging changes for the make update-beats
conditions:
- or:
- merged
- closed
- and:
- label=automation
- head~=^update-beats
actions:
delete_head_branch: