[BACKLOG-32242] Update suite build to library v20191121

pentaho · Nov 21, 2019 · f2a30b3 · f2a30b3
1 parent 450d4fa
commit f2a30b3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/resources/builders/suite-release.yaml b/resources/builders/suite-release.yaml
@@ -1,56 +1,56 @@
 buildProperties:
   BUILD_PLAN_ID                  : Suite Release Build
 
-  BUILD_ORDER_REPORT             : true
   USE_MINION_JOBS                : true
   BUILD_RETRIES                  : 3
-  MINION_POLL_CRON_INTERVAL      : ''
 
   # Maven
-  MAVEN_DEFAULT_COMMAND_OPTIONS  : -B -e -Drelease
-  MAVEN_DEFAULT_DIRECTIVES       : clean deploy
+  MAVEN_DEFAULT_COMMAND_OPTIONS: -B -e
+  MAVEN_DEFAULT_DIRECTIVES:
+    build: clean deploy -DskipTests -Drelease
+    test: test
+
   MAVEN_PUBLIC_RELEASE_REPO_URL  : https://nexus.pentaho.org/content/repositories/public-9.0-qat
   MAVEN_PRIVATE_RELEASE_REPO_URL : https://nexus.pentaho.org/content/repositories/private-9.0-qat
   ARCHIVING_PATH_GROUP_REGEX     : '.*/target/(?:(windows|linux|mac)(?!.*(dependencies)).*/)?'
 
   # Version based control properties
-  RUN_VERSIONING                 : true
+  RUN_STAGE_VERSION              : ${RUN_STAGE_BUILD}
   VERSION_MERGER_LOG_LEVEL       : WARN
   RELEASE_VERSION                : 9.0.0.0
   DEPLOYMENT_FOLDER              : 9.0-QAT
   RELEASE_MODE                   : true
-  DEFAULT_BRANCH                 : master
   SUITE_BUILD_RESOURCES_BRANCH   : 9.0.0.0
   SERVICEPACK_BRANCH             : master
   JENKINS_FOLDER_NAME            : '9.0'
 
   JOB_ITEM_DEFAULTS:
-    dockerImage : jenkins-build/maven-oracle-jdk-8
+    dockerImage : jenkins-build/maven/oracle-jdk/8
     scmBranch   : master
-    directives  : ${MAVEN_DEFAULT_DIRECTIVES}
 
   # We need to override this until this pipeline is the nightly
-  BUILD_HOSTING_ROOT             : /build2/artifacts/hosted
+  BUILD_HOSTING_ROOT: /build2/artifacts/hosted
 
   # Tagging
-  CREATE_TAG                     : true
-  TAG_NAME                       : ${RELEASE_VERSION}-RC
+  RUN_STAGE_TAG: true
+  TAG_NAME: ${RELEASE_VERSION}-RC
+
+  # Reports
+  BUILD_ORDER_REPORT  : true
 
-  # Slack Reporting
-  SLACK_INTEGRATION              : true
+  BUILD_SLACK_CHANNEL : 'buildteam-alerts'
+  SLACK_INTEGRATION   : true
   SLACK_CHANNEL:
-    BUILD_FAILURE                : 'qat-builds,buildteam-alerts'
-    BUILD_ABORTED                : 'buildteam-alerts'
-    BUILD_UNSTABLE               : 'qat-builds,buildteam-alerts'
-    BUILD_SUCCESS                : 'qat-builds,buildteam-alerts'
-  BUILD_SLACK_CHANNEL            : 'buildteam-alerts'
+    BUILD_FAILURE     : 'qat-builds,buildteam-alerts'
+    BUILD_ABORTED     : 'buildteam-alerts'
+    BUILD_UNSTABLE    : 'qat-builds,buildteam-alerts'
+    BUILD_SUCCESS     : 'qat-builds,buildteam-alerts'
 
   # SP specific parameters
   PREVIOUS_RELEASE_VERSION       : ''
   SP_RELEASE_VERSION             : '201910'
   DO_AUTO_PATCH                  : false
 
-
 jobGroups:
   200:
      - jobID           :  coding-standards
@@ -224,7 +224,7 @@ jobGroups:
      - jobID           :  archetypes-ee
        scmUrl          :  https://github.com/pentaho/maven-project-archetypes-ee.git
        versionProperty :  archetypes.version
-       
+
      - jobID           :  big-data-plugin-lowdeps
        scmUrl          :  https://github.com/pentaho/big-data-plugin.git
        directives      :  += -DskipDefault -P lowdeps

diff --git a/scripts/JenkinsfileCommons.groovy b/scripts/JenkinsfileCommons.groovy
@@ -17,7 +17,7 @@ def getJobParameters(String buildJobName) {
 
   List parameterNames = [
     'NOOP', 'BUILD_PLAN_ID', 'FIRST_JOB', 'LAST_JOB', 'CLEAN_ALL_CACHES', 'CLEAN_SCM_WORKSPACES',
-    'RUN_BUILDS', 'RUN_CHECKOUTS', 'RUN_VERSIONING', 'RUN_UNIT_TESTS', 'ARCHIVE_ARTIFACTS',
+    'RUN_STAGE_BUILD', 'RUN_STAGE_CHECKOUT', 'RUN_STAGE_VERSION', 'RUN_STAGE_TEST', 'RUN_STAGE_ARCHIVE',
     'RELEASE_VERSION', 'DEPLOYMENT_FOLDER', 'SUITE_BUILD_RESOURCES_BRANCH',
     'MAVEN_PUBLIC_RELEASE_REPO_URL', 'MAVEN_PUBLIC_SNAPSHOT_REPO_URL',
     'MAVEN_PRIVATE_RELEASE_REPO_URL', 'MAVEN_PRIVATE_SNAPSHOT_REPO_URL', 'MAVEN_RESOLVE_REPO_URL',