diff --git a/Jenkinsfile.unix b/Jenkinsfile.unix index d34f0db95..5596ff27e 100644 --- a/Jenkinsfile.unix +++ b/Jenkinsfile.unix @@ -1,42 +1,59 @@ -/* -* Copyright © 2010 - 2013 Apama Ltd. -* Copyright © 2013 - 2018 Software AG, Darmstadt, Germany and/or its licensors -* -* SPDX-License-Identifier: Apache-2.0 -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ - pipeline { agent any - + environment { + ZIPNAME = "webmethods-${BUILD_NUMBER}.zip" + APPNAME = 'dmo00_wbm(wm107_default_is)' // This is the name o the XLD application + APP_TLA = 'DMO' + PROJECT = 'dmo00' + GROUP_ID = 'dmo00_wbm' + ZIP_PATH = '/opt/softwareag/IntegrationServer/instances/default/replicate/inbound' + XML_PATH = '/opt/softwareag/IntegrationServer/instances/default/properties' + WBM_APPNAME = 'wm107_instance_is' //WBM_APPNAME is the name of the application in webmethods + } + parameters { + choice(name: 'TARGET_INSTANCE', choices: ['default'], description: 'Pick the target IS instance the wM Code you want to deploy') + choice(name: 'TARGET_ENV', choices: ['DV'], description: 'Pick the target environment the wM Code you want to deploy') + string(name: 'BUILD_BRANCH', defaultValue: 'release/*', description: 'Name of the Branch') + } + stages { - stage('Build'){ + stage('Clean Workspace'){ + steps{ + echo 'Cleaning the jenkins Workspace before the build' + always { + cleanWs() + } + echo "Deleting OLD artifacts if any" + sh "rm -rf zips/webmethods-*.zip" + } + }// Cleaning the jenkins Workspace before the build + stage('git commit') { + steps{ + script{ + gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim() + SCMREVISION = gitCommit.take(8) + currentBuild.description = APPNAME + echo """ + ZIP_PATH : ${ZIP_PATH} + XML_PATH : ${XML_PATH} + ZIPNAME : ${ZIPNAME} + BUILD_BRANCH : ${BUILD_BRANCH} + SCMREVISION : ${SCMREVISION} + APPNAME : ${APPNAME} + """ + } + } + } + stage('Build deployables'){ steps { - sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} build" + echo 'Starting to build webMethods assets using webMethods ABE' + sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${GROUP_ID}_${WBM_APPNAME} -DAPP_TLA=${APP_TLA} -DTARGET_INSTANCE=${TARGET_INSTANCE} -DTARGET_ENV =${TARGET_ENV} build" } - } + }// End Build deployables stage('Deploy') { steps { sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy" } } - stage('Test') { - steps { - sh "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} test" - junit 'report/' - } - } } } diff --git a/README.md b/README.md index 0d9bfd0a1..5cfab9773 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,5 @@ For more information you can Ask a Question in the [Tech Community Forums](https You can find additional information in the [Software AG Tech Community](https://tech.forums.softwareag.com/tag/webmethods). ____________________ -Contact us at [Tech Community](mailto:technologycommunity@softwareag.com?subject=Github/SoftwareAG) if you have any questions. + +test - test - test diff --git a/assets/IS/Packages/.gitkeep b/assets/IS/Packages/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/Packages/DMO_CICD_LSD/.classpath b/assets/IS/Packages/DMO_CICD_LSD/.classpath new file mode 100644 index 000000000..615ab5012 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/.classpath @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/IS/Tests/FibonachiTest/.project b/assets/IS/Packages/DMO_CICD_LSD/.project similarity index 61% rename from assets/IS/Tests/FibonachiTest/.project rename to assets/IS/Packages/DMO_CICD_LSD/.project index c8e6fd4ce..7dac5b4be 100644 --- a/assets/IS/Tests/FibonachiTest/.project +++ b/assets/IS/Packages/DMO_CICD_LSD/.project @@ -1,17 +1,23 @@ - - - FibonachiTest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + DMO_CICD_LSD + + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.softwareag.is.vcsintegration.ISPackageBuilder + + + + + + org.eclipse.jdt.core.javanature + com.softwareag.is.vcsintegration.nature + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/manifest.v3 b/assets/IS/Packages/DMO_CICD_LSD/manifest.v3 new file mode 100644 index 000000000..c62aa628f --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/manifest.v3 @@ -0,0 +1,13 @@ + + + + yes + no + 1.0 + + + + + + yes + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml new file mode 100644 index 000000000..389e710f8 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + record + unknown + false + record + 0 + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + true + + + + + + + + record + unknown + false + addIntsOutput + record + 0 + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak new file mode 100644 index 000000000..d62317f7e --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/flow.xml.bak @@ -0,0 +1,4 @@ + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf new file mode 100644 index 000000000..4bfbf74d1 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts/node.ndf @@ -0,0 +1,142 @@ + + + + flow + default + java 3.5 + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + true + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + true + + + + yes + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + + false + 1 + 60 + 5 + 60 + 1 + + 300 + false + + + TRACE + HEAD + DELETE + POST + GET + OPTIONS + PUT + PATCH + + 1 + + true + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml new file mode 100644 index 000000000..5417932bd --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + record + unknown + false + record + 0 + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + record + unknown + false + addIntsOutput + record + 0 + true + false + false + + + field + unknown + false + value + string + 0 + true + false + false + + + true + + + + + + + + + + + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak new file mode 100644 index 000000000..d62317f7e --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/flow.xml.bak @@ -0,0 +1,4 @@ + + + + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf new file mode 100644 index 000000000..4bfbf74d1 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/addInts_1/node.ndf @@ -0,0 +1,142 @@ + + + + flow + default + java 3.5 + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + num1 + string + 0 + + + true + false + false + + + record + unknown + + + true + false + false + + false + num2 + string + 0 + + + true + false + false + + + true + + + record + unknown + false + record + 0 + IData + true + false + false + + + record + unknown + + + true + false + false + + false + result + string + 0 + + + true + false + false + + + true + + + + yes + no + no + 15 + 1 + off + no + $null + no + 0 + 0 + none + none + 0 + + + + 0 + false + false + true + + + false + 1 + 60 + 5 + 60 + 1 + + 300 + false + + + TRACE + HEAD + DELETE + POST + GET + OPTIONS + PUT + PATCH + + 1 + + true + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf new file mode 100644 index 000000000..1dee48d1d --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/FlowServices/node.idf @@ -0,0 +1,8 @@ + + + + interface + unknown + DMO_CICD_LSD.FlowServices + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf new file mode 100644 index 000000000..72a781750 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/ns/DMO_CICD_LSD/node.idf @@ -0,0 +1,8 @@ + + + + interface + unknown + DMO_CICD_LSD + false + diff --git a/assets/IS/Packages/DMO_CICD_LSD/pub/index.html b/assets/IS/Packages/DMO_CICD_LSD/pub/index.html new file mode 100644 index 000000000..fe677b1e0 --- /dev/null +++ b/assets/IS/Packages/DMO_CICD_LSD/pub/index.html @@ -0,0 +1,2 @@ + +

Welcome to the Home Page for the DMO_CICD_LSD Package.

\ No newline at end of file diff --git a/assets/IS/Tests/FibonachiTest/.classpath b/assets/IS/Tests/FibonachiTest/.classpath deleted file mode 100644 index 3485755ac..000000000 --- a/assets/IS/Tests/FibonachiTest/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/IS/Tests/FibonachiTest/.classpath.swp b/assets/IS/Tests/FibonachiTest/.classpath.swp deleted file mode 100644 index 9cd3016c3..000000000 Binary files a/assets/IS/Tests/FibonachiTest/.classpath.swp and /dev/null differ diff --git a/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs b/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8fec98aea..000000000 --- a/assets/IS/Tests/FibonachiTest/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Thu Jan 10 14:25:20 CET 2013 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/assets/IS/Tests/FibonachiTest/bin/.gitignore b/assets/IS/Tests/FibonachiTest/bin/.gitignore deleted file mode 100644 index 9e21f06c3..000000000 --- a/assets/IS/Tests/FibonachiTest/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/PackageTest/ -/test/ diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml deleted file mode 100644 index 484a0545c..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibExpectedOutput.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - 8 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml deleted file mode 100644 index cdd9897ec..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/fibWrongInput.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -1 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml deleted file mode 100644 index 1394e3d06..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/finInput.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - 6 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml deleted file mode 100644 index 3b1c44f94..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/data/mockSubstractIntWrong.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - 5 - - diff --git a/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml b/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml deleted file mode 100644 index afcde751a..000000000 --- a/assets/IS/Tests/FibonachiTest/resources/test/xml/setup/FibonachiTest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/IS/config-deployment/.gitkeep b/assets/IS/config-deployment/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/config-deployment/DMO_DeploymentSet.txt b/assets/IS/config-deployment/DMO_DeploymentSet.txt new file mode 100644 index 000000000..baeebc5ec --- /dev/null +++ b/assets/IS/config-deployment/DMO_DeploymentSet.txt @@ -0,0 +1 @@ +DMO_CICD_LSD.zip \ No newline at end of file diff --git a/assets/IS/config/.gitkeep b/assets/IS/config/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/assets/IS/properties/.gitkeep b/assets/IS/properties/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/build.xml b/build.xml index eda02ba92..613eebccf 100644 --- a/build.xml +++ b/build.xml @@ -1,57 +1,34 @@ - - - + - - - - - - - - - + + + - - - - - - + + + + - + - - + + - - + + - - + + + + + + diff --git a/project.properties b/project.properties index a900c1312..969880864 100644 --- a/project.properties +++ b/project.properties @@ -5,12 +5,8 @@ # Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG". isPackages=./assets/IS/Packages isTests=./assets/IS/Tests -isConfigDir=./assets/IS/config -bpmProjects=./assets/BPM/ -mwsProjects=./assets/MWS/ -rulesProjects=./assets/Rules/ -#Should always be named UniversalMessaging -umExport=./assets/UniversalMessaging +isConfig=./assets/IS/config +deployerConfig-./assets/IS/config-deployment