From 1cb37197e1a47dcb6737a13cafaa5515ec85f107 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 12 Oct 2017 14:00:59 +0200 Subject: [PATCH] Do git clean in autorelease-checkout-gerrit-patch For a patch which removes a submodule (project leaving autorelease) checking out HEAD before autorelease-checkout-gerrit-patch was causing the project directory be present during verify-autorelease which could lead to false Verified+1. Recent example: Removing Yangtools without updating validate-pom.xml properly. This change adds forceful clean to autorelease-checkout-gerrit-patch. The jacoco workaround now has to be applied after such cleaning. Change-Id: I651a7eaa212835d6cce52ee3706a85f12189f244 Signed-off-by: Vratko Polak --- jjb/autorelease/autorelease-macros.yaml | 3 +++ jjb/autorelease/autorelease-templates.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 6271d8ae4..238fe9b5b 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -34,6 +34,9 @@ # If the project is autorelease then we need to init and update submodules if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then git submodule update --init + # The previous checkout might have failed to remove directory of a submodule being removed. + # See https://stackoverflow.com/a/10761699 + git clean -dff fi - builder: diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 4e9999b61..dcea32366 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -368,8 +368,8 @@ files: '**/*.xml' builders: - - jacoco-nojava-workaround - autorelease-checkout-gerrit-patch + - jacoco-nojava-workaround - autorelease-generate-release-patches # In a perfect world projects should be releasing separately and we consume them # via a project that pulls the release bits from each project from Nexus. -- 2.36.6