Skip to content

Enable selective testing of integrations on main and backport branches #4683

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

Merged
merged 4 commits into from
Nov 21, 2022
Merged

Enable selective testing of integrations on main and backport branches #4683

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5e82cf
Enable selective testing of integrations on main and backport branches
jsoriano Nov 21, 2022
c00c717
Use previous successful commit
jsoriano Nov 21, 2022
cf99825
Syntax
jsoriano Nov 21, 2022
551dc61
Review suggestions
jsoriano Nov 21, 2022
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
15 changes: 10 additions & 5 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,20 @@ def isPrAffected(integrationName) {
}
}

if (env.BRANCH_NAME == "main") {
echo "[${integrationName}] PR is affected: running on main branch"
return true
}

// Setting default values for a PR.
// Source: https://github.com/elastic/apm-pipeline-library/blob/721115cf0fdb2b5a4e1cb6a576bfbb7035d14485/vars/getGitMatchingGroup.groovy#L40-L41
def from = env.CHANGE_TARGET?.trim() ? "origin/${env.CHANGE_TARGET}" : "${env.GIT_PREVIOUS_COMMIT?.trim() ? env.GIT_PREVIOUS_COMMIT : env.GIT_BASE_COMMIT}"
def to = env.GIT_BASE_COMMIT

// If running for an integration branch (main, backport-*) check with
// GIT_PREVIOUS_SUCCESSFUL_COMMIT to check if the branch is still healthy.
// If this value is not available, check with last commit.
if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME.startsWith('backport-')) {
echo "[${integrationName}] PR is affected: running on ${env.BRANCH_NAME} branch"
from = "origin/${env.BRANCH_NAME}"
to = env.GIT_PREVIOUS_SUCCESSFUL_COMMIT?.trim() ? env.GIT_PREVIOUS_SUCCESSFUL_COMMIT : "origin/${env.BRANCH_NAME}^"
}

def r = sh(label: "[${integrationName}] git-diff: check non-package files", script: "git diff --name-only \$(git merge-base ${from} ${to}) ${to} | egrep -v '^(packages/|.github/CODEOWNERS)'", returnStatus: true)
if (r == 0) {
echo "[${integrationName}] PR is affected: found non-package files"
Expand Down