Skip to content

Commit

Permalink
Merge pull request #10 from emartin-pentaho/BACKLOG-22982
Browse files Browse the repository at this point in the history 
[BACKLOG-22982] Add version-merging to the build pipeline
  • Loading branch information
@hbfernandes
hbfernandes authored May 9, 2018
2 parents 629d766 + a5cfd68 commit ba88093
Show file tree
Hide file tree
Showing 3 changed files with 150 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ pipeline {
defaultValue: '',
description: 'The last job in the yaml file to build (empty = last yaml item)'
)
string(
name: 'RELEASE_BUILD_NUMBER',
defaultValue: '',
description: 'Override the build number. Leave this blank to use the actual build number',
)
string(
name: 'CLEAN_CACHES_REGEX',
defaultValue: '.*-SNAPSHOT.*',
Expand Down Expand Up @@ -237,6 +242,12 @@ pipeline {
}
}

stage('Version') {
steps {
doVersioning(mappedBuildData)
}
}

stage('Build') {
when {
expression {
Expand Down
7 changes: 7 additions & 0 deletions resources/builders/suiteBuildControlData.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ buildProperties:
ANT_DEFAULT_DIRECTIVES : clean-all resolve publish
GRADLE_DEFAULT_DIRECTIVES : -q

# Version based control properties
UPDATE_VERSIONS : false
RELEASE_VERSION : 8.2.0.0-SNAPSHOT
SUITE_RELEASE_VERSION : 8.2.0.0-SNAPSHOT
RELEASE_MODE : false
ADD_BUILD_ID_VERSION_TAIL : true

# job item field defaults
# These are arbitrary properties for doing replacements in this data file
SCM_HOST_ROOT : https://github.com
Expand Down
132 changes: 132 additions & 0 deletions resources/config/version.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
com.pentaho|pentaho-ee-parent-pom=8.2.0.0-SNAPSHOT
com.pentaho|pentaho-ee-jar-parent-pom=8.2.0.0-SNAPSHOT
com.pentaho|pentaho-ee-bundle-parent-pom=8.2.0.0-SNAPSHOT
org.pentaho|pentaho-parent-pom=8.2.0.0-SNAPSHOT
org.pentaho|pentaho-ce-parent-pom=8.2.0.0-SNAPSHOT
org.pentaho|pentaho-ce-jar-parent-pom=8.2.0.0-SNAPSHOT
org.pentaho|pentaho-ce-bundle-parent-pom=8.2.0.0-SNAPSHOT
org.pentaho.di.plugins|pdi-plugins=8.2.0.0-SNAPSHOT

ael.version=8.2.0.0-SNAPSHOT
aggdesigner.version=8.2.0.0-SNAPSHOT
analysis-ee-plugin.version=8.2.0.0-SNAPSHOT
analyzer-plugin.version=8.2.0.0-SNAPSHOT
archetypes.version=8.2.0.0-SNAPSHOT
big-data-plugin.version=8.2.0.0-SNAPSHOT
coding-standards.version=8.2.0.0-SNAPSHOT
common-ui.version=8.2.0.0-SNAPSHOT
commons-database.version=8.2.0.0-SNAPSHOT
commons-gwt.version=8.2.0.0-SNAPSHOT
commons-xul.version=8.2.0.0-SNAPSHOT
dashboard.version=8.2.0.0-SNAPSHOT
dashboard-plugin.version=8.2.0.0-SNAPSHOT
jdbc-distribution-utility.version=8.2.0.0-SNAPSHOT
kafka-plugin.version=8.2.0.0-SNAPSHOT
launcher.version=8.2.0.0-SNAPSHOT
metadata-client-tool.version=8.2.0.0-SNAPSHOT
metastore.version=8.2.0.0-SNAPSHOT
mondrian.version=8.2.0.0-SNAPSHOT
mondrian-schemaworkbench-plugins.version=8.2.0.0-SNAPSHOT
oss-licenses.version=8.2.0.0-SNAPSHOT
pdi-data-refinery-plugin.version=8.2.0.0-SNAPSHOT
pdi-dataservice-client-plugin.version=8.2.0.0-SNAPSHOT
pdi-dataservice-plugin.version=8.2.0.0-SNAPSHOT
pdi-google-analytics-plugin-ce.version=8.2.0.0-SNAPSHOT
pdi-google-analytics-plugin.version=8.2.0.0-SNAPSHOT
pdi-google-docs-plugin.version=8.2.0.0-SNAPSHOT
pdi-hadoop-plugin-ee.version=8.2.0.0-SNAPSHOT
pdi-jms-plugin.version=8.2.0.0-SNAPSHOT
pdi-monitoring-plugin.version=8.2.0.0-SNAPSHOT
pdi-osgi-bridge.version=8.2.0.0-SNAPSHOT
pdi-platform-utils-plugin.version=8.2.0.0-SNAPSHOT
pdi-plugins-ee.version=8.2.0.0-SNAPSHOT
pdi-pur-plugin.version=8.2.0.0-SNAPSHOT
pdi-salesforce-plugin.version=8.2.0.0-SNAPSHOT
pdi-sap-hana-bulk-loader-plugin.version=8.2.0.0-SNAPSHOT
pdi-scheduler-plugin.version=8.2.0.0-SNAPSHOT
pdi-spark-plugin.version=8.2.0.0-SNAPSHOT
pdi-teradata-tpt-plugin.version=8.2.0.0-SNAPSHOT
pdi-weka-plugin-group.version=8.2.0.0-SNAPSHOT
pdi-json-plugin.version=8.2.0.0-SNAPSHOT
pdi-r-plugin.version=8.2.0.0-SNAPSHOT
pdi-sap-plugin.version=8.2.0.0-SNAPSHOT
pdi-sdk-plugins.version=8.2.0.0-SNAPSHOT
pdi-xml-plugin.version=8.2.0.0-SNAPSHOT
pdi.version=8.2.0.0-SNAPSHOT
pentaho-actionsequence-dom.version=8.2.0.0-SNAPSHOT
pentaho-camel.version=8.2.0.0-SNAPSHOT
pentaho-cassandra-plugin.version=8.2.0.0-SNAPSHOT
pentaho-ccc-plugin.version=8.2.0.0-SNAPSHOT
pentaho-cda-plugin.version=8.2.0.0-SNAPSHOT
pentaho-cde-plugin.version=8.2.0.0-SNAPSHOT
pentaho-cdf-plugin.version=8.2.0.0-SNAPSHOT
pentaho-cgg-plugin.version=8.2.0.0-SNAPSHOT
pentaho-chartbeans.version=8.2.0.0-SNAPSHOT
pentaho-connections.version=8.2.0.0-SNAPSHOT
pentaho-cpf-plugin.version=8.2.0.0-SNAPSHOT
pentaho-cpk-plugin.version=8.2.0.0-SNAPSHOT
pentaho-dashboard-chart-editor.version=8.2.0.0-SNAPSHOT
pentaho-data-access.version=8.2.0.0-SNAPSHOT
pentaho-data-mining.version=8.2.0.0-SNAPSHOT
pentaho-data-profiling.version=8.2.0.0-SNAPSHOT
pentaho-database-model.version=8.2.0.0-SNAPSHOT
pentaho-det.version=8.2.0.0-SNAPSHOT
pentaho-ee-chart-plugin.version=8.2.0.0-SNAPSHOT
pentaho-ee-dsc.version=8.2.0.0-SNAPSHOT
pentaho-ee-license-installer.version=8.2.0.0-SNAPSHOT
pentaho-eula-wrap-config.version=8.2.0.0-SNAPSHOT
pentaho-geo-plugin.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-api.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-cdh511.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-cdh512.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-cdh513.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-cdh514.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-emr59.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-emr511.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-hdp26.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-mapr520.version=8.2.0.0-SNAPSHOT
pentaho-hadoop-shims-mapr60.version=8.2.0.0-SNAPSHOT
pentaho-hdfs-vfs.version=8.2.0.0-SNAPSHOT
pentaho-jpivot-plugin.version=8.2.0.0-SNAPSHOT
pentaho-json.version=8.2.0.0-SNAPSHOT
pentaho-kettle-yarn-plugin.version=8.2.0.0-SNAPSHOT
pentaho-karaf.version=8.2.0.0-SNAPSHOT
pentaho-launcher.version=8.2.0.0-SNAPSHOT
pentaho-marketplace-modules.version=8.2.0.0-SNAPSHOT
pentaho-metadata.version=8.2.0.0-SNAPSHOT
pentaho-metastore.version=8.2.0.0-SNAPSHOT
pentaho-metaverse.version=8.2.0.0-SNAPSHOT
pentaho-modeler.version=8.2.0.0-SNAPSHOT
pentaho-mongo-utils.version=8.2.0.0-SNAPSHOT
pentaho-mongodb-plugin.version=8.2.0.0-SNAPSHOT
pentaho-mql-editor.version=8.2.0.0-SNAPSHOT
pentaho-operations-mart.version=8.2.0.0-SNAPSHOT
pentaho-osgi-bundles.version=8.2.0.0-SNAPSHOT
pentaho-palo-core.version=8.2.0.0-SNAPSHOT
pentaho-pdi-ee-plugin.version=8.2.0.0-SNAPSHOT
pentaho-pdi-plugin.version=8.2.0.0-SNAPSHOT
pentaho-r-plugin.version=8.2.0.0-SNAPSHOT
pentaho-registry.version=8.2.0.0-SNAPSHOT
pentaho-report-wizard-core.version=8.2.0.0-SNAPSHOT
pentaho-reporting-plugin.version=8.2.0.0-SNAPSHOT
pentaho-reporting.version=8.2.0.0-SNAPSHOT
pentaho-repository.version=8.2.0.0-SNAPSHOT
pentaho-s3-vfs.version=8.2.0.0-SNAPSHOT
pentaho-sparkl-plugin.version=8.2.0.0-SNAPSHOT
pentaho-splunk-plugin.version=8.2.0.0-SNAPSHOT
pentaho-versionchecker.version=8.2.0.0-SNAPSHOT
pentaho-vfs-browser.version=8.2.0.0-SNAPSHOT
pentaho.version=8.2.0.0-SNAPSHOT
pir-plugin.version=8.2.0.0-SNAPSHOT
platform.version=8.2.0.0-SNAPSHOT
schemaworkbench-plugins.version=8.2.0.0-SNAPSHOT
vertica-bulkloader-plugin.version=8.2.0.0-SNAPSHOT
worker-nodes.version=8.2.0.0-SNAPSHOT

pentaho-cwm.version=1.5.4
pentaho-ofc4j.version=1.1.0
proguard.version=5.2.1
weka-jri.version=5.1.0

version-merger.version=1.0.6

0 comments on commit ba88093

Please sign in to comment.