From nobody Thu May 16 08:05:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1690883900197235.9640716438313; Tue, 1 Aug 2023 02:58:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.574028.899201 (Exim 4.92) (envelope-from ) id 1qQm8i-0001UP-Ej; Tue, 01 Aug 2023 09:58:04 +0000 Received: by outflank-mailman (output) from mailman id 574028.899201; Tue, 01 Aug 2023 09:58:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8i-0001UG-Br; Tue, 01 Aug 2023 09:58:04 +0000 Received: by outflank-mailman (input) for mailman id 574028; Tue, 01 Aug 2023 09:58:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8h-0001NH-9v for xen-devel@lists.xenproject.org; Tue, 01 Aug 2023 09:58:03 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e62f2a7e-3051-11ee-8613-37d641c3527e; Tue, 01 Aug 2023 11:58:00 +0200 (CEST) Received: from beta.station (net-188-218-251-179.cust.vodafonedsl.it [188.218.251.179]) by support.bugseng.com (Postfix) with ESMTPSA id 1D9A84EE0737; Tue, 1 Aug 2023 11:58:01 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e62f2a7e-3051-11ee-8613-37d641c3527e From: Simone Ballarin To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Simone Ballarin , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH 1/4] automation/eclair: add support for tag pipelines Date: Tue, 1 Aug 2023 11:57:01 +0200 Message-Id: <5e79b954062385c4d765c32347bcb45896d3ed5e.1690881495.git.simone.ballarin@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1690883904322100001 Content-Type: text/plain; charset="utf-8" The ECLAIR jobs fail when triggered by tag pipelines (e.g. xen-project/patchew/xen). This patch extends the integration to support such pipelines. Signed-off-by: Simone Ballarin Acked-by: Stefano Stabellini --- .../eclair_analysis/ECLAIR/action.settings | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/action.settings b/automation= /eclair_analysis/ECLAIR/action.settings index 96426811a8..71c10d5141 100644 --- a/automation/eclair_analysis/ECLAIR/action.settings +++ b/automation/eclair_analysis/ECLAIR/action.settings @@ -41,7 +41,7 @@ github) push | workflow_dispatch) event=3Dpush # Extract the branch name from "refs/heads/" - branch=3D"${GITHUB_REF#refs/heads/}" + ref=3D"${GITHUB_REF#refs/heads/}" headCommitId=3D"${GITHUB_SHA}" pushUser=3D"${GITHUB_ACTOR}" ;; @@ -75,7 +75,13 @@ gitlab) ;; push | pipeline | web) event=3Dpush - branch=3D"${CI_COMMIT_BRANCH}" + if [ -n "${CI_COMMIT_BRANCH:-}" ]; then + ref_kind=3Dbranch + ref=3D"${CI_COMMIT_BRANCH}" + else + ref_kind=3Dtag + ref=3D"${CI_COMMIT_TAG}" + fi headCommitId=3D"${CI_COMMIT_SHA}" pushUser=3D"${GITLAB_USER_NAME}" ;; @@ -99,7 +105,7 @@ jenkins) jenkinsBotToken=3D"${ECLAIR_BOT_TOKEN:-}" =20 event=3Dpush - branch=3D"${GIT_BRANCH}" + ref=3D"${GIT_BRANCH}" headCommitId=3D"${GIT_COMMIT}" pushUser=3D$(git show --pretty=3D'format:%aN' -s) ;; @@ -111,7 +117,7 @@ esac =20 if [ "${event}" =3D "push" ] && [ -n "${autoPRBranch:-}" ]; then # AUTO PR Feature enabled - if ! [ "${branch}" =3D "${autoPRBranch}" ] || + if ! [ "${ref}" =3D "${autoPRBranch}" ] || ! [ "${repository}" =3D "${autoPRRepository}" ]; then event=3Dauto_pull_request fi @@ -123,17 +129,17 @@ pull_request) jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: ${= pullRequestUser} wants to merge ${pullRequestHeadRepo}:${pullRequestHeadRef= } (${headCommitId}) into ${pullRequestBaseRef} (${baseCommitId})" ;; push) - subDir=3D"${branch}" - jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: br= anch ${branch} (${headCommitId})" - badgeLabel=3D"ECLAIR ${ANALYSIS_KIND} ${branch}${variantHeadline} #${j= obId}" + subDir=3D"${ref}" + jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: ${= ref_kind} ${ref} (${headCommitId})" + badgeLabel=3D"ECLAIR ${ANALYSIS_KIND} ${ref}${variantHeadline} #${jobI= d}" ;; auto_pull_request) git remote remove autoPRRemote || true git remote add autoPRRemote "${autoPRRemoteUrl}" git fetch -q autoPRRemote - subDir=3D"${branch}" + subDir=3D"${ref}" baseCommitId=3D$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD) - jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: ${= pushUser} wants to merge ${repository}:${branch} (${headCommitId}) into ${a= utoPRRepository}/${autoPRBranch} (${baseCommitId})" + jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: ${= pushUser} wants to merge ${repository}:${ref} (${headCommitId}) into ${auto= PRRepository}/${autoPRBranch} (${baseCommitId})" ;; *) echo "Unexpected event ${event}" >&2 --=20 2.34.1 From nobody Thu May 16 08:05:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1690883902595182.7487422206989; Tue, 1 Aug 2023 02:58:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.574029.899212 (Exim 4.92) (envelope-from ) id 1qQm8k-0001ka-MG; Tue, 01 Aug 2023 09:58:06 +0000 Received: by outflank-mailman (output) from mailman id 574029.899212; Tue, 01 Aug 2023 09:58:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8k-0001kR-JD; Tue, 01 Aug 2023 09:58:06 +0000 Received: by outflank-mailman (input) for mailman id 574029; Tue, 01 Aug 2023 09:58:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8j-0001NH-AG for xen-devel@lists.xenproject.org; Tue, 01 Aug 2023 09:58:05 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e7637744-3051-11ee-8613-37d641c3527e; Tue, 01 Aug 2023 11:58:02 +0200 (CEST) Received: from beta.station (net-188-218-251-179.cust.vodafonedsl.it [188.218.251.179]) by support.bugseng.com (Postfix) with ESMTPSA id 2029F4EE0740; Tue, 1 Aug 2023 11:58:03 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e7637744-3051-11ee-8613-37d641c3527e From: Simone Ballarin To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Simone Ballarin , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH 2/4] automation/eclair: add direct link to reports Date: Tue, 1 Aug 2023 11:57:02 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1690883906365100003 Content-Type: text/plain; charset="utf-8" This patch adds direct links to the analysis findings in the console log. Signed-off-by: Simone Ballarin Acked-by: Stefano Stabellini --- .../eclair_analysis/ECLAIR/action.helpers | 84 ++++++++++++++----- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/action.helpers b/automation/= eclair_analysis/ECLAIR/action.helpers index 2ad6428eaa..df9bf2bd11 100644 --- a/automation/eclair_analysis/ECLAIR/action.helpers +++ b/automation/eclair_analysis/ECLAIR/action.helpers @@ -1,17 +1,26 @@ +esc=3D$(printf '\e') +cr=3D$(printf '\r') + if [ -n "${GITLAB_CI:-}" ]; then ci=3Dgitlab + eol=3D + link_start=3D"${esc}[33m" + link_end=3D"${esc}[m" elif [ -n "${GITHUB_ACTION:-}" ]; then ci=3Dgithub + eol=3D"\\" + link_start=3D + link_end=3D elif [ -n "${JENKINS_HOME:-}" ]; then ci=3Djenkins + eol=3D"
" + link_start=3D + link_end=3D else echo "Unexpected CI/CD context" >&2 exit 1 fi =20 -esc=3D$(printf '\e') -cr=3D$(printf '\r') - open_section() { id=3D$1 title=3D$2 @@ -36,54 +45,86 @@ summary() { =20 case "${ci}" in github) - nl=3D"\\" + eol=3D"\\" ;; gitlab) - nl=3D + eol=3D ;; jenkins) - nl=3D"
" + eol=3D"
" ;; *) - nl=3D + eol=3D ;; esac =20 + currentDbReportsUrl=3D"${eclairReportUrlPrefix}/fs${jobDir}/PROJECT.ec= d;/by_service.html#service&kind" if [ -z "${newReports}" ]; then - fixedMsg=3D + fixedMsg=3D"No fixed reports as there is no baseline" unfixedMsg=3D"Unfixed reports: ${unfixedReports}" - countsMsg=3D"${unfixedMsg}" + referenceReportsMsgTxt=3D + referenceReportsMsgLog=3D else fixedMsg=3D"Fixed reports: ${fixedReports}" unfixedMsg=3D"Unfixed reports: ${unfixedReports} [new: ${newReport= s}]" - countsMsg=3D"${fixedMsg}${nl} -${unfixedMsg}" + case "${event}" in + pull_request | auto_pull_request) + referenceDbReportsUrl=3D"${eclairReportUrlPrefix}/fs${jobDir}/= base/PROJECT.ecd;/by_service.html#service&kind" + reference_kind=3Dbase + ;; + push) + referenceDbReportsUrl=3D"${eclairReportUrlPrefix}/fs${jobDir}/= prev/PROJECT.ecd;/by_service.html#service&kind" + reference_kind=3Dprevious + ;; + *) + echo "Unexpected event ${event}" >&2 + exit 1 + ;; + esac fi + case "${ci}" in jenkins) + if [ -n "${newReports}" ]; then + referenceReportsMsgTxt=3D"Browse ${reference_kind} reports" + fi cat <"${summaryTxt}" -${countsMsg} = ${nl} +${fixedMsg}${eol} +${unfixedMsg} = ${eol}

${jobHeadline}

-Browse analysis results +Browse analysis summary +Browse current reports +${referenceReportsMsgTxt} EOF ;; *) + if [ -n "${newReports}" ]; then + referenceReportsMsgTxt=3D"Browse ${reference_kind} reports: ${= referenceDbReportsUrl}" + fi cat <"${summaryTxt}" Analysis Summary =20 -${jobHeadline}${nl} -${countsMsg}${nl} -[Browse analysis](${indexHtmlUrl}) +${jobHeadline}${eol} +${fixedMsg}${eol} +${unfixedMsg}${eol} +Browse analysis summary: ${indexHtmlUrl} +Browse current reports: ${currentDbReportsUrl} +${referenceReportsMsgTxt} EOF ;; esac =20 + analysisSummaryMsgLog=3D"Browse analysis summary: ${link_start}${index= HtmlUrl}${link_end}" + currentReportsMsgLog=3D"Browse current reports: ${link_start}${current= DbReportsUrl}${link_end}" + if [ -n "${newReports}" ]; then + referenceReportsMsgLog=3D"Browse ${reference_kind} reports: ${link= _start}${referenceDbReportsUrl}${link_end}" + fi case ${ci} in github) cat "${summaryTxt}" >"${GITHUB_STEP_SUMMARY}" @@ -93,8 +134,11 @@ EOF # Generate summary and print it (GitLab-specific) cat < Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1690883906112323.350127881189; Tue, 1 Aug 2023 02:58:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.574030.899222 (Exim 4.92) (envelope-from ) id 1qQm8l-00021w-V0; Tue, 01 Aug 2023 09:58:07 +0000 Received: by outflank-mailman (output) from mailman id 574030.899222; Tue, 01 Aug 2023 09:58:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8l-00021k-Rw; Tue, 01 Aug 2023 09:58:07 +0000 Received: by outflank-mailman (input) for mailman id 574030; Tue, 01 Aug 2023 09:58:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8k-0001NH-KZ for xen-devel@lists.xenproject.org; Tue, 01 Aug 2023 09:58:06 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e83784b4-3051-11ee-8613-37d641c3527e; Tue, 01 Aug 2023 11:58:04 +0200 (CEST) Received: from beta.station (net-188-218-251-179.cust.vodafonedsl.it [188.218.251.179]) by support.bugseng.com (Postfix) with ESMTPSA id 8062B4EE0741; Tue, 1 Aug 2023 11:58:04 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e83784b4-3051-11ee-8613-37d641c3527e From: Simone Ballarin To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Simone Ballarin , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH 3/4] automation/eclair: add scheduled pipelines Date: Tue, 1 Aug 2023 11:57:03 +0200 Message-Id: <76f3cdddcba485e8124659566b2f992b3b14da17.1690881495.git.simone.ballarin@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1690883908421100007 Content-Type: text/plain; charset="utf-8" This patch introduces six new ECLAIR jobs that run only when triggered by a GitLab scheduled pipeline. Signed-off-by: Simone Ballarin Reviewed-by: Stefano Stabellini --- .../eclair_analysis/ECLAIR/action.settings | 2 +- automation/gitlab-ci/analyze.yaml | 65 +++++++++++++++++-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/automation/eclair_analysis/ECLAIR/action.settings b/automation= /eclair_analysis/ECLAIR/action.settings index 71c10d5141..528bc24c72 100644 --- a/automation/eclair_analysis/ECLAIR/action.settings +++ b/automation/eclair_analysis/ECLAIR/action.settings @@ -73,7 +73,7 @@ gitlab) headCommitId=3D"${CI_COMMIT_SHA}" baseCommitId=3D"${CI_MERGE_REQUEST_DIFF_BASE_SHA}" ;; - push | pipeline | web) + push | pipeline | web | schedule) event=3Dpush if [ -n "${CI_COMMIT_BRANCH:-}" ]; then ref_kind=3Dbranch diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analy= ze.yaml index 3d8166572b..3325ef9d9a 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -8,6 +8,8 @@ ENABLE_ECLAIR_BOT: "n" AUTO_PR_BRANCH: "staging" AUTO_PR_REPOSITORY: "xen-project/xen" + script: + - ./automation/scripts/eclair 2>&1 | tee "${LOGFILE}" artifacts: when: always paths: @@ -23,8 +25,6 @@ eclair-x86_64: LOGFILE: "eclair-x86_64.log" VARIANT: "X86_64" RULESET: "Set1" - script: - - ./automation/scripts/eclair 2>&1 | tee "${LOGFILE}" allow_failure: true =20 eclair-ARM64: @@ -33,6 +33,63 @@ eclair-ARM64: LOGFILE: "eclair-ARM64.log" VARIANT: "ARM64" RULESET: "Set1" - script: - - ./automation/scripts/eclair 2>&1 | tee "${LOGFILE}" + allow_failure: true + +.eclair-analysis:on-schedule: + extends: .eclair-analysis + rules: + - if: $CI_PIPELINE_SOURCE =3D=3D "schedule" + +eclair-x86_64-Set1:on-schedule: + extends: .eclair-analysis:on-schedule + variables: + VARIANT: "X86_64" + RULESET: "Set1" + ANALYSIS_KIND: "${RULESET}-scheduled" + LOGFILE: "eclair-${VARIANT}-${RULESET}.log" + allow_failure: true + +eclair-x86_64-Set2:on-schedule: + extends: .eclair-analysis:on-schedule + variables: + VARIANT: "X86_64" + RULESET: "Set2" + ANALYSIS_KIND: "${RULESET}-scheduled" + LOGFILE: "eclair-${VARIANT}-${RULESET}.log" + allow_failure: true + +eclair-x86_64-Set3:on-schedule: + extends: .eclair-analysis:on-schedule + variables: + VARIANT: "X86_64" + RULESET: "Set3" + ANALYSIS_KIND: "${RULESET}-scheduled" + LOGFILE: "eclair-${VARIANT}-${RULESET}.log" + allow_failure: true + +eclair-ARM64-Set1:on-schedule: + extends: .eclair-analysis:on-schedule + variables: + VARIANT: "ARM64" + RULESET: "Set1" + ANALYSIS_KIND: "${RULESET}-scheduled" + LOGFILE: "eclair-${VARIANT}-${RULESET}.log" + allow_failure: true + +eclair-ARM64-Set2:on-schedule: + extends: .eclair-analysis:on-schedule + variables: + VARIANT: "ARM64" + RULESET: "Set2" + ANALYSIS_KIND: "${RULESET}-scheduled" + LOGFILE: "eclair-${VARIANT}-${RULESET}.log" + allow_failure: true + +eclair-ARM64-Set3:on-schedule: + extends: .eclair-analysis:on-schedule + variables: + VARIANT: "ARM64" + RULESET: "Set3" + ANALYSIS_KIND: "${RULESET}-scheduled" + LOGFILE: "eclair-${VARIANT}-${RULESET}.log" allow_failure: true --=20 2.34.1 From nobody Thu May 16 08:05:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16908839064777.927584648645507; Tue, 1 Aug 2023 02:58:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.574031.899232 (Exim 4.92) (envelope-from ) id 1qQm8n-0002J4-6R; Tue, 01 Aug 2023 09:58:09 +0000 Received: by outflank-mailman (output) from mailman id 574031.899232; Tue, 01 Aug 2023 09:58:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8n-0002Iu-3S; Tue, 01 Aug 2023 09:58:09 +0000 Received: by outflank-mailman (input) for mailman id 574031; Tue, 01 Aug 2023 09:58:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8l-0000wJ-Fv for xen-devel@lists.xenproject.org; Tue, 01 Aug 2023 09:58:07 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e9cfcd28-3051-11ee-b259-6b7b168915f2; Tue, 01 Aug 2023 11:58:07 +0200 (CEST) Received: from beta.station (net-188-218-251-179.cust.vodafonedsl.it [188.218.251.179]) by support.bugseng.com (Postfix) with ESMTPSA id 733144EE0737; Tue, 1 Aug 2023 11:58:06 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e9cfcd28-3051-11ee-b259-6b7b168915f2 From: Simone Ballarin To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Simone Ballarin , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH 4/4] automation/eclair: avoid failure in case of missing merge point Date: Tue, 1 Aug 2023 11:57:04 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1690883907434100005 Content-Type: text/plain; charset="utf-8" In the context of an auto pull request, when a common merge point is not found the integration will continue the analysis without failing. Signed-off-by: Simone Ballarin Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/action.settings | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/action.settings b/automation= /eclair_analysis/ECLAIR/action.settings index 528bc24c72..f96368ffc7 100644 --- a/automation/eclair_analysis/ECLAIR/action.settings +++ b/automation/eclair_analysis/ECLAIR/action.settings @@ -138,7 +138,9 @@ auto_pull_request) git remote add autoPRRemote "${autoPRRemoteUrl}" git fetch -q autoPRRemote subDir=3D"${ref}" - baseCommitId=3D$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD) + if ! baseCommitId=3D$(git merge-base "autoPRRemote/${autoPRBranch}" HE= AD); then + baseCommitId=3Dno_merge_point + fi jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: ${= pushUser} wants to merge ${repository}:${ref} (${headCommitId}) into ${auto= PRRepository}/${autoPRBranch} (${baseCommitId})" ;; *) --=20 2.34.1