Skip to content

MFT and other changes #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Oct 30, 2018
Merged

MFT and other changes #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7c6d19a
added sag-is-mft.yaml file
Oct 15, 2018
c444b9e
added sag-mws-mftui file for MFT portal provision
Oct 15, 2018
ef5eb90
added template file for MFT configuration
Oct 15, 2018
1848f28
added template file for MFT UI
Oct 15, 2018
f8ce8fd
deleted duplicate folder
Oct 16, 2018
9e441dc
deleted duplicate folders
Oct 25, 2018
23f0bbf
added micro template for MFT
Oct 25, 2018
4cb1f5f
Merge pull request #4 from SoftwareAG/master
sergeipogrebnyak Oct 25, 2018
2b1c2f0
WIP: mysql
Oct 25, 2018
5b0d5a8
Copy MySQL driver
Oct 26, 2018
b9e5970
Schemas are failing
Oct 26, 2018
e43ef5c
README
Oct 26, 2018
808e7ab
Still failing
Oct 26, 2018
f29ab63
Testing MySQL
Oct 26, 2018
48ff868
Tests for DB
Oct 26, 2018
e8cdd9e
Massive testing
Oct 26, 2018
344a7ce
Exx licenses and other small fixes
Oct 27, 2018
444d7ac
Update template.yaml
Oct 29, 2018
6810745
Update test.sh
Oct 29, 2018
24e9c6c
Update template.yaml
Oct 29, 2018
0471937
Update test.sh
Oct 29, 2018
ca28af3
Update test.sh
Oct 29, 2018
233b0d2
Merge pull request #5 from Peermahamad/master
sergeipogrebnyak Oct 29, 2018
3733b10
Oracle db
Oct 29, 2018
284c90c
Making sag-is-mft work and test
Oct 29, 2018
d0cd5a4
sag-mft-config - failing
Oct 29, 2018
3fe34d0
sag-mft-ui
Oct 29, 2018
138cce2
Two test groups are unstable
Oct 29, 2018
319b2d8
stateful
Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 181 additions & 56 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,28 @@ pipeline {
}
}
parallel {
// stage('Group Oracle') {
// stage('Group Oracle / Optimize') {
// when {
// anyOf {
// expression { return params.TEST }
// changeset "templates/sag-db-oracle"
// changeset "templates/sag-optimize-*"
// changeset "templates/sag-infradc"
// }
// }
// agent { label 'docker' }
// environment {
// CC_ENV = 'oracle'
// }
// steps {
// sh 'docker-compose pull cc'
// sh 'docker-compose up -V -d --remove-orphans cc'
// sh 'docker-compose -f templates/sag-db-oracle/docker-compose.yml up -d oracle'

// sh './provisionw sag-db-oracle'
// sh './provisionw sag-infradc'
// sh './provisionw sag-optimize-analysis'
// sh './provisionw sag-optimize-wsdc'
// }
// post {
// always {
Expand All @@ -94,15 +107,28 @@ pipeline {
// }
// }
// }
// stage('Group SQLServer') {
// stage('Group SQLServer / MWS') {
// when {
// anyOf {
// expression { return params.TEST }
// changeset "templates/sag-db-sqlserver"
// changeset "templates/sag-mws-*"
// }
// }
// agent { label 'docker' }
// environment {
// CC_ENV = 'sqlserver'
// }
// steps {
// sh 'docker-compose pull cc'
// sh 'docker-compose up -V -d --remove-orphans cc'
// sh 'docker-compose -f templates/sag-db-sqlserver/docker-compose.yml up -d sqlserver'

// sh './provisionw sag-db-sqlserver'
// sh './provisionw sag-mws-server'
// sh './provisionw sag-mws-infradcui'
// sh './provisionw sag-mws-applatform'
// sh './provisionw sag-mws-mftui'
// }
// post {
// always {
Expand All @@ -111,59 +137,158 @@ pipeline {
// }
// }
// }
stage('Group Core') {
stage('Group MySQL / DAP') {
when {
anyOf {
expression { return params.TEST }
changeset "templates/sag-db-mysql"
changeset "templates/sag-is-*"
changeset "templates/sag-des-*"
}
}
agent { label 'docker' }
environment {
CC_ENV = 'mysql'
}
steps {
sh 'docker-compose pull cc'
sh 'docker-compose up -V -d --remove-orphans cc'
sh 'docker-compose -f templates/sag-db-mysql/docker-compose.yml up -d mysql'

sh './provisionw sag-db-mysql'
sh './provisionw sag-is-cluster db.type=mysqlce'
sh './provisionw sag-is-config'
sh './provisionw sag-des'
sh './provisionw sag-des-config'
sh "./provisionw sag-is-mft"
// sh "./provisionw sag-mft-config" # FAILING!
}
post {
always {
sh 'docker-compose -f templates/sag-db-mysql/docker-compose.yml down'
sh 'docker-compose down'
}
}
}
stage('Group IoT') {
when {
anyOf {
expression { return params.TEST }
changeset "templates/sag-um-*"
changeset "templates/sag-tc-*"
changeset "templates/sag-tdb-*"
changeset "templates/sag-apama-*"
}
}
agent { label 'docker' }
environment {
CC_ENV = 'dev'
}
steps {
// checkout scm
// sh 'docker-compose pull cc'
sh 'docker-compose pull cc'
sh 'docker-compose up -V -d --remove-orphans cc'

sh './provisionw sag-um-server'
sh './provisionw sag-um-config'

sh './provisionw sag-apama-correlator'

sh './provisionw sag-tc-server'
// sh './provisionw sag-tdb-server'
sh './provisionw sag-is-server'
//sh './provisionw sag-tdb-server'
}
post {
always {
sh 'docker-compose down'
}
}
}
stage('Group Integration') {
when {
anyOf {
expression { return params.TEST }
changeset "templates/sag-is-*"
changeset "templates/sag-msc-*"
}
}
agent { label 'docker' }
environment {
CC_ENV = 'dev'
}
steps {
sh 'docker-compose pull cc'
sh 'docker-compose up -V -d --remove-orphans cc'

sh "./provisionw sag-msc-server"
sh './provisionw sag-is-cloudstreams'
sh './provisionw sag-is-applatform'
sh './provisionw sag-is-config'
// sh './provisionw sag-des'
// sh './provisionw sag-des-config'
// sh './provisionw sag-apama-correlator'
}
post {
always {
sh 'docker-compose down'
}
}
}
// stage('Group 2') {
// agent { label 'docker' }
// environment {
// CC_ENV = 'dev'
// }
// steps {
// // sh 'docker-compose pull cc'
// sh 'docker-compose up -V -d --remove-orphans cc'
stage('Group Tools') {
when {
anyOf {
expression { return params.TEST }
changeset "templates/sag-abe"
changeset "templates/sag-designer-*"
}
}
agent { label 'docker' }
environment {
CC_ENV = 'dev'
}
steps {
// sh 'docker-compose pull cc'
sh 'docker-compose up -V -d --remove-orphans cc'

// sh './provisionw sag-abe'
// sh "./provisionw sag-msc-server"
// sh './provisionw sag-is-cloudstreams'
// sh './provisionw sag-designer-services'
// sh './provisionw sag-designer-cloudstreams'
// sh './provisionw sag-exx-broker'
// sh './provisionw sag-exx-c-rpc-server'
// sh './provisionw sag-exx-java-rpc-server'
// sh './provisionw sag-exx-xml-rpc-server'
// sh './provisionw sag-infradc'
// // sh './provisionw sag-onedata'
// }
// post {
// always {
// sh 'docker-compose down'
// }
// }
// }
sh './provisionw sag-abe'

sh './provisionw sag-designer-services'
sh './provisionw sag-designer-cloudstreams'

// sh './provisionw sag-onedata'
}
post {
always {
sh 'docker-compose down'
}
}
}
stage('Group EntireX') {
when {
anyOf {
expression { return params.TEST }
changeset "templates/sag-exx-**"
}
}
agent { label 'docker' }
environment {
CC_ENV = 'dev'
}
steps {
sh 'docker-compose pull cc'
sh 'docker-compose up -V -d --remove-orphans cc'

sh './provisionw sag-exx-broker'
sh './provisionw sag-exx-c-rpc-server'
sh './provisionw sag-exx-java-rpc-server'
sh './provisionw sag-exx-xml-rpc-server'
sh './provisionw sag-exx-csl-rpc-server'
sh './provisionw sag-exx-ims-rpc-server'
sh './provisionw sag-exx-mf-broker'
sh './provisionw sag-exx-mq-rpc-server'
sh './provisionw sag-exx-net-rpc-server'
}
post {
always {
sh 'docker-compose down'
}
}
}
}
}
stage("Build Images") {
Expand All @@ -184,26 +309,26 @@ pipeline {
}
}
}
// stage('Group 2') {
// agent { label 'docker' }
// steps {
// dir ('containers') {
// sh 'docker-compose config'
// sh 'docker-compose build --no-cache --force-rm asset-builder microservices-runtime cloud-streams'
// sh 'docker-compose push asset-builder microservices-runtime cloud-streams'
// }
// }
// }
// stage('Group 3') {
// agent { label 'docker' }
// steps {
// dir ('containers') {
// sh 'docker-compose config'
// sh 'docker-compose build --no-cache --force-rm entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
// sh 'docker-compose push entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
// }
// }
// }
stage('Group 2') {
agent { label 'docker' }
steps {
dir ('containers') {
sh 'docker-compose config'
sh 'docker-compose build --no-cache --force-rm asset-builder microservices-runtime cloud-streams'
sh 'docker-compose push asset-builder microservices-runtime cloud-streams'
}
}
}
stage('Group 3') {
agent { label 'docker' }
steps {
dir ('containers') {
sh 'docker-compose config'
sh 'docker-compose build --no-cache --force-rm entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
sh 'docker-compose push entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
}
}
}
}
}
stage("Deploy") {
Expand Down
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Template alias | Provisions Platform Manager
Template alias | Description
-------------------------|--------------------------------
[sag-db-oracle](templates/sag-db-oracle) | Creates a user, database, and webMethods database schemas on an Oracle database server.
[sag-db-sqlserver](templates/sag-db-sqlserver) | Creates a user, database, and webMethods database schemas on an SQL Server database server.
[sag-db-sqlserver](templates/sag-db-sqlserver) | Creates a user, database, and webMethods database schemas on a SQL Server database server.
[sag-db-mysql](templates/sag-db-mysql) | Creates a user, database, and webMethods database schemas on a MySQL database server.

### Micro Templates for provisioning Software AG products

Expand All @@ -75,8 +76,8 @@ Template alias | Provisions
[sag-is-cloudstreams](templates/sag-is-applatform) | Cloudstreams on Integration Server or Microservices runtime
[sag-is-applatform](templates/sag-is-applatform) | Application Platform on Integration Server or Microservices runtime
[sag-msc-server](templates/sag-msc-server) | webMethods Microservices Runtime
[sag-mws-server](templates/sag-mws-server) | My webMethods server
[sag-mws-infradc](templates/sag-mws-server) | Infrastructure Data Collector UI on My webMethods server
<!-- [sag-mws-server](templates/sag-mws-server) | My webMethods server
[sag-mws-infradc](templates/sag-mws-server) | Infrastructure Data Collector UI on My webMethods server -->
[sag-tc-server](templates/sag-tc-server) | Terracotta BigMemory server
[sag-tc-cluster](templates/sag-tc-cluster) | Terracotta BigMemory cluster
[sag-tdb-server](templates/sag-tdb-server) | Terracotta DB server
Expand Down
41 changes: 41 additions & 0 deletions environments/mysql/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
###############################################################################
# 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.
#
###############################################################################
# properties for local development/testing on TRUNK

db.host=mysql
db.type=mysql
db.username=webm
db.password=webm
db.name=webm
db.url="jdbc:mysql://mysql:3306/webm"
db.admin.password=root
db.admin.username=root

um.fixes=[]
um.url=nsp://localhost:9000
tc.fixes=[]
is.fixes=[]
is.um.url=nsp://localhost:9000
des.fixes=[]
des.um.url=nsp://localhost:9000
apama.fixes=[]
cst.fixes=[]
infradc.jms.host=localhost
infradc.fixes=[]
mws.infradcui.fixes=[]
1 change: 1 addition & 0 deletions environments/sqlserver/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ cst.fixes=[]
infradc.jms.host=localhost
infradc.fixes=[]
mws.infradcui.fixes=[]
mws.applatform.fixes=[]
Loading