Brining master to latest 10.1

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "antcc"]
 path = antcc
 url = https://github.com/SoftwareAG/sagdevops-antcc.git
+[submodule "library"]
+path = library
+url = https://github.com/SoftwareAG/sagdevops-templates.git

.travis.yml

@@ -1,9 +1,12 @@
 language: java
 jdk:
  - oraclejdk8
-env:
- - release=9.12
- - release=10.0
+#env:
+# - release=9.12
+# - release=10.1
 script:
- - ant boot -Daccept.license=true -Dbootstrap=$release
- - ~/sag/cc/CommandCentral/client/bin/sagccant masters test installers mirrors -Denv=travis-ci
+ - export CC_ENV=travis-ci && export CC_BOOT=10.1
+ - ant boot -Daccept.license=true
+ - ~/sag/cc/CommandCentral/client/bin/sagccant credentials masters test installers clean
+ - ~/sag/cc/CommandCentral/client/bin/sagccant mirrors mirrors2
+ - ~/sag/cc/CommandCentral/client/bin/sagccant mirrors mirrors2 -Drelease=9.12

DOCKER.md

@@ -0,0 +1,39 @@
+# Running Command Central on Docker
+
+* See [general information](README.md) on Command Central setup requirements.
+* See [getting access to Docker images](https://github.com/SoftwareAG/sagdevops-hello-docker)
+
+## Quick start Command Central server
+
+```bash
+export CC_PASSWORD=strongpass
+export EMPOWER_USR=you@company.com
+export EMPOWER_PSW=yourpass
+
+docker-compose run --rm init
+```
+
+Open [Command Central Web UI](https://0.0.0.0:8091/cce/web/?entry=stacks#jobs:) and login as Administrator/strongpass
+
+## Quick start Dev environment
+
+To initialize couple of development nodes and Oracle XE db run:
+
+```bash
+docker-compose run --rm initdev
+```
+
+Open [Command Central Web UI](https://0.0.0.0:8091/cce/web/#) to see the results.
+
+Here are properties that you can use to run against this environment:
+
+```bash
+nodes=dev1,dev2
+
+db.url="jdbc:wm:oracle://oracledev:1521;SID=XE"
+db.username=webm
+db.password=webm
+
+spm.host=dev1
+spm.host2=dev2
+```

Jenkinsfile

@@ -1,103 +1,68 @@
 #!groovy​
 pipeline {
- agent {
- label 'master' // most of work on linux master/client
- }
+ agent none
+
  options {
  buildDiscarder(logRotator(numToKeepStr:'10'))
  disableConcurrentBuilds()
+ skipDefaultCheckout()
  }
- parameters { 
- string(name: 'VM', defaultValue: 'bgcctbp05', description: 'Command Central server VM: bgcctbp05 (lnx), bgcctbp21 (win), bgninjabvt22 (sol)') 
- }
-
  environment {
+ CC_BOOT = 'default' // your custom boot config
+ CC_ENV = 'default' // your custom env config
+
  VM_SERVER = 'daevvc02'
- CC_ENV = 'default' // 9.12 or 10.0
- }
+ CC_VM = 'bgninjabvt06' // your VM
+  CC_AGENT = "bgninjabvt06.eur.ad.sag" // Jenkins agent
 
+ // set EMPOWER_USR and EMPOWER_PSW env variables using Jenkins credentials
+ EMPOWER = credentials('empower')
+ // CC_CLI_HOME = '$HOME/sag/cc/CommandCentral/client'
+ }
  stages {
- stage("Restart VM") {
- steps {
- vSphere buildStep: [$class: 'PowerOff', vm: params.VM, evenIfSuspended: false, shutdownGracefully: false], serverName: "${VM_SERVER}"
- vSphere buildStep: [$class: 'PowerOn', vm: params.VM, timeoutInSeconds: 180], serverName: "${VM_SERVER}"
- }
- }
  stage("Prepare") {
+ agent {
+ label 'master'
+ } 
  steps {
  checkout scm
- sh 'git submodule update --init' 
  stash(name:'scripts', includes:'**')
  }
  }
- stage("Boot Unix") {
+ stage ('Restart VM') {
  agent {
- label params.VM + '.eur.ad.sag' // bootstrap MUST run on the target VM
+ label 'master'
  }
- tools {
- ant "ant-1.9.7"
- jdk "jdk-1.8"
- } 
- /*
- when { 
- expression { return isUnix() } 
- }*/
  steps {
- unstash 'scripts'
- timeout(time:60, unit:'MINUTES') {
- sh "ant boot -Daccept.license=true -Dbootstrap=${CC_ENV}" // use sh
- }
- }
- }
- /*
- stage('Boot Windows') {
- agent {
- label params.VM + '.eur.ad.sag' // bootstrap MUST run on the target VM
- }
- tools {
- ant "ant-1.9.7"
- jdk "jdk-1.8"
- } 
- when { 
- expression { return !isUnix() } 
+ vSphere buildStep: [$class: 'PowerOff', evenIfSuspended: false, shutdownGracefully: false, vm: env.CC_VM], serverName: env.VM_SERVER
+ vSphere buildStep: [$class: 'PowerOn', timeoutInSeconds: 180, vm: env.CC_VM], serverName: env.VM_SERVER
  }
+ } 
+ stage("Boot") {
  steps {
- unstash 'scripts'
- timeout(time:60, unit:'MINUTES') {
- bat "ant boot -Dbootstrap=${CC_ENV}" // use bat
+ node ("${env.CC_AGENT}") {
+  unstash 'scripts'
+ bat "ant boot -Daccept.license=true -Dbootstrap=$CC_BOOT"
  }
  }
- }*/ 
-
- stage('Up and Test') {
- agent {
- label params.VM + '.eur.ad.sag' // target VM
- }
- tools {
- ant "ant-1.9.7"
- jdk "jdk-1.8"
- } 
- environment {
- // set EMPOWER_USR and EMPOWER_PSW env variables using Jenkins credentials
- EMPOWER = credentials('empower')
- CC_SERVER = params.VM
- CC_CLI_HOME = '$HOME/sag/cc/CommandCentral/client'
- }
+ } 
+ stage ('Up') {
  steps {
- unstash 'scripts'
- timeout(time:120, unit:'MINUTES') {
- //sh "ant client -Dbootstrap=${CC_ENV}" // boot client
- sh "$CC_CLI_HOME/bin/sagccant masters test installers mirrors -Denv=test-${CC_ENV}" // point to the target VM
+ node ("${env.CC_AGENT}") {
+ unstash 'scripts'
+ bat "ant tuneup credentials masters licenses -Denv=$CC_ENV"
  }
  }
- post {
- success {
- junit 'build/tests/**/TEST-*.xml'
- }
- unstable {
+ } 
+ stage ('Download') {
+ steps {
+ node ("${env.CC_AGENT}") {
+ unstash 'scripts'
+ bat "ant test -Denv=$CC_ENV"
  junit 'build/tests/**/TEST-*.xml'
+ bat "ant images installers mirrors -Denv=$CC_ENV"
  }
- } 
- }
+ }
+ } 
  }
 }