Merge 10.3 changes forward to 10.4

.env

@@ -1,2 +1,2 @@
-REG=daerepository03.eur.ad.sag:4443/ccdevops
-TAG=10.3
+CC_REG=store/softwareag
+CC_TAG=10.3.0.2

.travis.yml

@@ -5,24 +5,31 @@ matrix:
  include:
  - os: linux
  dist: trusty
- - os: osx
  fast_finish: true
 
 env:
  global:
  - CC_ENV=travis-ci
+ - CC_PASSWORD=manage123
 
- # matrix:
- # - CC_BOOT=default
+services:
+ - docker
 
 before_install:
- - antcc/bootstrap/install.sh
- - . $HOME/.bash_profile
+ - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
 
 script:
+ - docker-compose run --rm init
+ - docker-compose down
+ - docker-compose up -d cc
+ - docker-compose run --rm init ant waitcc test -Dbuild.dir=/tmp/build
+ - docker-compose down
+
+ - antcc/bootstrap/install.sh
+ - . $HOME/.bash_profile 
  - antcc boot -Daccept.license=true
- - antcc up test
+ - antcc up test stopcc
 
 cache:
- directories:
+ directories:
  - $HOME/Downloads

Jenkinsfile

@@ -86,7 +86,9 @@ pipeline {
  environment {
  SAG_AQUARIUS = 'aquarius-bg.eur.ad.sag'
  CC_INSTALLER_URL = "http://aquarius-bg.eur.ad.sag/cc/installers" // internal download site
- CC_VERSION = '10.3-milestone'
+ CC_VERSION = '10.3-fix1'
+ ANTCC_VERSION = '10.3-stable'
+ ANTCC_DISTRO = 'antcc-nojava'
  CC_PASSWORD = 'manage'
  CC_BOOT = 'staging'
  CC_ENV = 'staging' // your custom env config 

README.md

@@ -317,6 +317,24 @@ See examples of CI configuration files:
 * [Travis CI](.travis.yml)
 * [Appveyor CI](appveyor.yml)
 
+## Launching Command Central Docker container
+
+The fastest way to get Command Central up and running is to launch Docker container from the Docker Store.
+
+> IMPORTANT: Please see [sagdevops-hello-docker](https://github.com/SoftwareAG/sagdevops-hello-docker) for getting started instructions.
+
+```bash
+EMPOWER_USR=you@company.com \
+EMPOWER_PSW=**** \
+docker-compose run --rm init
+```
+
+To setup mirrors run:
+
+```bash
+docker-compose run --rm init ant mirrors
+```
+
 ## Creating staging environments on Software AG network
 
 You can setup pre-released software staging environments
@@ -325,17 +343,17 @@ if you have access to Software AG network.
 On Linux and Mac OS:
 
 ```bash
-# export CC_BOOT=staging
-# export CC_ENV=staging
-# export CC_VERSION=10.3-milestone
+export CC_BOOT=staging
+export CC_ENV=staging
+export CC_VERSION=10.3-fix1
 
 export EMPOWER_USR=you@softwareag.com
 export EMPOWER_PSW=*****
 
 export SAG_AQUARIUS=aquarius-dae.eur.ad.sag
 export CC_INSTALLER_URL=http://aquarius-dae.eur.ad.sag/PDShare/cc
 
-# for clean boxes, bootstrap java+ant+antcc
+# for clean boxes, bootstrap antcc
 # antcc/bootstrap/install.sh
 # . ~/.bash_profile || . ~/.profile
 
@@ -346,33 +364,51 @@ ant up staging test
 On Windows:
 
 ```powershell
-# set CC_BOOT=staging
-# set CC_ENV=staging
-# set CC_VERSION=10.3-milestone
+set CC_BOOT=staging
+set CC_ENV=staging
+set CC_VERSION=10.3-fix1
 
 set EMPOWER_USR=you@softwareag.com
 set EMPOWER_PSW=*****
 
 set SAG_AQUARIUS=aquarius-dae.eur.ad.sag
 set CC_INSTALLER_URL=http://aquarius-dae.eur.ad.sag/PDShare/cc
 
-# for clean boxes, bootstrap java+ant+antcc
+# for clean boxes, bootstrap ant+antcc
 # .\antcc\bootstrap\install.ps1
 
 ant boot
 ant up staging test
 ```
 
+On Docker:
+
+```bash
+CC_REG=daerepository03.eur.ad.sag:4443/ccdevops \
+EMPOWER_USR=you@company.com \
+EMPOWER_PSW=**** \
+CC_ENV=staging \
+docker-compose run --rm init staging
+```
+
 ## Cleanup
 
-To uninstall Command Central run:
+Uninstall Command Central.
+
+On Linux run:
 
 ```bash
 ant uninstall -Dbootstrap=YOUR_BOOT_NAME
 ```
 
 > NOTE: `uninstall` target is currently NOT supported on Windows
 
+On Docker:
+
+```bash
+docker-compose down
+```
+
 _____________
 Contact us at [TECHcommunity](mailto:technologycommunity@softwareag.com?subject=Github/SoftwareAG) if you have any questions.
 ___________________

build.xml

@@ -8,11 +8,16 @@
 <param name="alias" value="sag-cc-creds-dev" />
 </antcall>
 <antcall target="apply">
-<param name="alias" value="sag-cc-repos-dev" />
+<param name="alias" value="sag-cc-repos-asset" />
 </antcall>
+<!-- THIS IS FOR GA -->
 <antcall target="apply">
-<param name="alias" value="sag-cc-repos-asset" />
+<param name="alias" value="sag-cc-repos-ga" />
 </antcall>
+<!-- THIS IS FOR TRUNK ONLY. Older CC, e.g. 10.3 can NOT connect to 10.4 repos! -->
+<!-- <antcall target="apply">
+<param name="alias" value="sag-cc-repos-dev" />
+</antcall> -->
 <antcall target="mirrors" />
 <antcall target="installers" />
 </target>

docker-compose.yml

@@ -1,23 +1,35 @@
 version: '3.2'
+volumes:
+ cce_data: {}
+ spm_data: {}
+ cce_conf: {}
+ spm_conf: {}
+
 services:
  cc:
- image: ${REG}/commandcentral-server:$TAG
+ image: ${CC_REG}/commandcentral-server:$CC_TAG
  ports:
  - 8091:8091
  - 8092:8092
  environment:
  - CC_PASSWORD
+ volumes:
+ - cce_conf:/opt/sagtools/profiles/CCE/configuration
+ - spm_conf:/opt/sagtools/profiles/SPM/configuration
+ - cce_data:/opt/sagtools/profiles/CCE/data
+ - spm_data:/opt/sagtools/profiles/SPM/data
+
  init:
- image: ${REG}/commandcentral-client:$TAG
+ image: ${CC_REG}/commandcentral-client:$CC_TAG
  volumes:
  - ./:/src
- - ./clients/docker.properties:/root/.sag/cc.properties
+# - ./clients/docker.properties:/root/.sag/cc.properties
  environment:
  - CC_SERVER=cc
  - CC_ENV
- - CC_PASSWORD
  - EMPOWER_USR
  - EMPOWER_PSW
- command: ant up test clean
+ - CC_PASSWORD
+ command: ant up test clean -Dbuild.dir=/tmp/build
  depends_on:
  - cc

environments/appveyor/env.properties

@@ -3,7 +3,7 @@
 ###
 
 # default release to use
-release=10.2
+release=10.3
 
 licenses.zip.url=https://github.com/SoftwareAG/sagdevops-cc-server/blob/release/103oct2018/licenses/licenses.zip?raw=true
 

environments/default/env.properties

@@ -4,7 +4,7 @@
 ###
 
 # default release to use
-release=10.2
+release=10.3
 
 # You can configure your Empower credentials here or use env variables
 # for one time credentials setup

environments/staging/env.properties

@@ -7,14 +7,14 @@ release=10.3
 
 licenses.zip.url=http://irepo.eur.ad.sag/projects/DEVOPS/repos/command-central/raw/licenses/sag10-rnd-all-licenses.zip?at=refs%2Fheads%2Frelease%2F101oct2017
 
-mirror.repo.product=CC_PI_103oct2018
-mirror.repo.fix=QARepo
+mirror.repo.product=webMethods-${release}_GA
+mirror.repo.fix=GA_Fix_Repo
 # mirror only specific product ids
-mirror.products=NUMRealmServer,MSC,NINJA
+mirror.products=NUMRealmServer,MSC
 # mirror specific platforms
 mirror.platforms=LNXAMD64,W64,OSX
 
-installers=cc-def-10.3-release-osx,cc-def-10.3-release-lnxamd64
+# installers=cc-def-10.3-fix1-osx,cc-def-10.3-fix1-lnxamd64
 
 # vSphere VM lab
 vm.server=daevc

environments/travis-ci/env.properties

@@ -3,12 +3,12 @@
 ###
 
 # default release to use
-release=10.2
+release=10.3
 
 licenses.zip.url=https://github.com/SoftwareAG/sagdevops-cc-server/blob/release/103oct2018/licenses/licenses.zip?raw=true
 
 # mirror only specific product ids
-mirror.products=NUMRealmServer,MSC
+mirror.products=CustomInstall
 
 # mirror specific platforms
 mirror.platforms=LNXAMD64

environments/tutorial/env.properties

@@ -3,7 +3,7 @@
 ###
 
 # default release to use
-release=10.2
+release=10.3
 
 licenses.zip.url=https://github.com/SoftwareAG/sagdevops-cc-server/blob/release/103oct2018/licenses/licenses.zip?raw=true
 #licenses.zip.url=http://irepo.eur.ad.sag/projects/DEVOPS/repos/command-central/raw/licenses/sag10-rnd-all-licenses.zip?at=refs%2Fheads%2Frelease%2F101oct2017

tests/test-masters.xml

@@ -5,20 +5,20 @@
 
 <target name="test-repos-master-prods" depends="sagenvInit" description="Verify SAG product repositories">
 <property file="${env.properties}"/>
-<cc command="list repository products" expectedvalues="${release}" format="csv" output="build/logs/product-repos.csv" wait="5" />
+<cc command="list repository products" expectedvalues="${release}" format="csv" output="${build.dir}/logs/product-repos.csv" wait="5" />
 </target>
 
 <!-- <target name="test-repos-master-prods-listing" depends="sagenvInit" description="Verify SAG product repository listing">
 <property file="${env.properties}"/>
-<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="build/logs/products.csv" wait="240" />
+<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="${build.dir}/logs/products.csv" wait="240" />
 </target> -->
 
 <target name="test-repos-master-fixes" depends="sagenvInit" description="Verify SAG fix repositories">
-<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="build/logs/fix-repos.csv" wait="5" />
+<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="${build.dir}/logs/fix-repos.csv" wait="5" />
 </target>
 
 <target name="test-repos-master-fixes-listing" depends="sagenvInit" description="Verify SAG fix repository listing">
-<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="build/logs/fixes.csv" />
+<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="${build.dir}/logs/fixes.csv" />
 </target>
 
 </project>