Ignore enforcer rules if stream is not 8 (#5419)

apache · Aug 1, 2023 · bbc3c5e · bbc3c5e
1 parent c494d58
commit bbc3c5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
@@ -273,10 +273,14 @@ void setDeployPropertyIfNeeded(String key, def value) {
 
 MavenCommand getMavenCommand(String directory = '') {
     directory = directory ?: getRepoName()
-    return new MavenCommand(this, ['-fae', '-ntp'])
+    def mvnCmd = new MavenCommand(this, ['-fae', '-ntp'])
                 .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
                 .inDirectory(directory)
                 .withProperty('full')
+    if (!isStream8()) { // Workaround as enforcer rules may not be fixed on other streams
+        mvnCmd.withProperty('enforcer.skip')
+    }
+    return mvnCmd
 }
 
 void runMavenDeploy(boolean localDeployment = false) {
@@ -307,3 +311,6 @@ String getLocalDeploymentFolder() {
     return "${env.MAVEN_DEPLOY_LOCAL_DIR}/${getRepoName()}"
 }
 
+boolean isStream8() {
+    return env.DROOLS_STREAM == '8'
+}
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
@@ -270,7 +270,7 @@ void runMavenDeploy() {
     if (env.MAVEN_DEPLOY_REPOSITORY) {
         mvnCmd.withDeployRepository(env.MAVEN_DEPLOY_REPOSITORY)
     }
-    mvnCmd.skipTests(true).run('clean deploy')
+    mvnCmd.skipTests(true).withProperty('enforcer.skip').run('clean deploy')
 }
 
 void uploadFileMgmt(String directory) {