diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 1f3e03a27ff..3583b6186df 100644 --- 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' +} \ No newline at end of file diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote index 5500d1808b2..9e6bb1da193 100644 --- 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) {