Skip to content

Commit c33cbe5

Browse files
sergeipogrebnyaksergeipogrebnyak
authored
Merge pull request #76 from sergeipogrebnyak/master
MFT and other changes
2 parents 932986f + 319b2d8 commit c33cbe5

File tree

35 files changed

+947
-102
lines changed

35 files changed

+947
-102
lines changed

‎Jenkinsfile‎

Lines changed: 181 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,28 @@ pipeline {
7777
}
7878
}
7979
parallel {
80-
// stage('Group Oracle') {
80+
// stage('Group Oracle / Optimize') {
81+
// when {
82+
// anyOf {
83+
// expression { return params.TEST }
84+
// changeset "templates/sag-db-oracle"
85+
// changeset "templates/sag-optimize-*"
86+
// changeset "templates/sag-infradc"
87+
// }
88+
// }
8189
// agent { label 'docker' }
8290
// environment {
8391
// CC_ENV = 'oracle'
8492
// }
8593
// steps {
94+
// sh 'docker-compose pull cc'
8695
// sh 'docker-compose up -V -d --remove-orphans cc'
8796
// sh 'docker-compose -f templates/sag-db-oracle/docker-compose.yml up -d oracle'
97+
8898
// sh './provisionw sag-db-oracle'
99+
// sh './provisionw sag-infradc'
100+
// sh './provisionw sag-optimize-analysis'
101+
// sh './provisionw sag-optimize-wsdc'
89102
// }
90103
// post {
91104
// always {
@@ -94,15 +107,28 @@ pipeline {
94107
// }
95108
// }
96109
// }
97-
// stage('Group SQLServer') {
110+
// stage('Group SQLServer / MWS') {
111+
// when {
112+
// anyOf {
113+
// expression { return params.TEST }
114+
// changeset "templates/sag-db-sqlserver"
115+
// changeset "templates/sag-mws-*"
116+
// }
117+
// }
98118
// agent { label 'docker' }
99119
// environment {
100120
// CC_ENV = 'sqlserver'
101121
// }
102122
// steps {
123+
// sh 'docker-compose pull cc'
103124
// sh 'docker-compose up -V -d --remove-orphans cc'
104125
// sh 'docker-compose -f templates/sag-db-sqlserver/docker-compose.yml up -d sqlserver'
126+
105127
// sh './provisionw sag-db-sqlserver'
128+
// sh './provisionw sag-mws-server'
129+
// sh './provisionw sag-mws-infradcui'
130+
// sh './provisionw sag-mws-applatform'
131+
// sh './provisionw sag-mws-mftui'
106132
// }
107133
// post {
108134
// always {
@@ -111,59 +137,158 @@ pipeline {
111137
// }
112138
// }
113139
// }
114-
stage('Group Core') {
140+
stage('Group MySQL / DAP') {
141+
when {
142+
anyOf {
143+
expression { return params.TEST }
144+
changeset "templates/sag-db-mysql"
145+
changeset "templates/sag-is-*"
146+
changeset "templates/sag-des-*"
147+
}
148+
}
149+
agent { label 'docker' }
150+
environment {
151+
CC_ENV = 'mysql'
152+
}
153+
steps {
154+
sh 'docker-compose pull cc'
155+
sh 'docker-compose up -V -d --remove-orphans cc'
156+
sh 'docker-compose -f templates/sag-db-mysql/docker-compose.yml up -d mysql'
157+
158+
sh './provisionw sag-db-mysql'
159+
sh './provisionw sag-is-cluster db.type=mysqlce'
160+
sh './provisionw sag-is-config'
161+
sh './provisionw sag-des'
162+
sh './provisionw sag-des-config'
163+
sh "./provisionw sag-is-mft"
164+
// sh "./provisionw sag-mft-config" # FAILING!
165+
}
166+
post {
167+
always {
168+
sh 'docker-compose -f templates/sag-db-mysql/docker-compose.yml down'
169+
sh 'docker-compose down'
170+
}
171+
}
172+
}
173+
stage('Group IoT') {
174+
when {
175+
anyOf {
176+
expression { return params.TEST }
177+
changeset "templates/sag-um-*"
178+
changeset "templates/sag-tc-*"
179+
changeset "templates/sag-tdb-*"
180+
changeset "templates/sag-apama-*"
181+
}
182+
}
115183
agent { label 'docker' }
116184
environment {
117185
CC_ENV = 'dev'
118186
}
119187
steps {
120-
// checkout scm
121-
// sh 'docker-compose pull cc'
188+
sh 'docker-compose pull cc'
122189
sh 'docker-compose up -V -d --remove-orphans cc'
123190

124191
sh './provisionw sag-um-server'
125192
sh './provisionw sag-um-config'
193+
194+
sh './provisionw sag-apama-correlator'
195+
126196
sh './provisionw sag-tc-server'
127-
// sh './provisionw sag-tdb-server'
128-
sh './provisionw sag-is-server'
197+
//sh './provisionw sag-tdb-server'
198+
}
199+
post {
200+
always {
201+
sh 'docker-compose down'
202+
}
203+
}
204+
}
205+
stage('Group Integration') {
206+
when {
207+
anyOf {
208+
expression { return params.TEST }
209+
changeset "templates/sag-is-*"
210+
changeset "templates/sag-msc-*"
211+
}
212+
}
213+
agent { label 'docker' }
214+
environment {
215+
CC_ENV = 'dev'
216+
}
217+
steps {
218+
sh 'docker-compose pull cc'
219+
sh 'docker-compose up -V -d --remove-orphans cc'
220+
221+
sh "./provisionw sag-msc-server"
222+
sh './provisionw sag-is-cloudstreams'
223+
sh './provisionw sag-is-applatform'
129224
sh './provisionw sag-is-config'
130-
// sh './provisionw sag-des'
131-
// sh './provisionw sag-des-config'
132-
// sh './provisionw sag-apama-correlator'
133225
}
134226
post {
135227
always {
136228
sh 'docker-compose down'
137229
}
138230
}
139231
}
140-
// stage('Group 2') {
141-
// agent { label 'docker' }
142-
// environment {
143-
// CC_ENV = 'dev'
144-
// }
145-
// steps {
146-
// // sh 'docker-compose pull cc'
147-
// sh 'docker-compose up -V -d --remove-orphans cc'
232+
stage('Group Tools') {
233+
when {
234+
anyOf {
235+
expression { return params.TEST }
236+
changeset "templates/sag-abe"
237+
changeset "templates/sag-designer-*"
238+
}
239+
}
240+
agent { label 'docker' }
241+
environment {
242+
CC_ENV = 'dev'
243+
}
244+
steps {
245+
// sh 'docker-compose pull cc'
246+
sh 'docker-compose up -V -d --remove-orphans cc'
148247

149-
// sh './provisionw sag-abe'
150-
// sh "./provisionw sag-msc-server"
151-
// sh './provisionw sag-is-cloudstreams'
152-
// sh './provisionw sag-designer-services'
153-
// sh './provisionw sag-designer-cloudstreams'
154-
// sh './provisionw sag-exx-broker'
155-
// sh './provisionw sag-exx-c-rpc-server'
156-
// sh './provisionw sag-exx-java-rpc-server'
157-
// sh './provisionw sag-exx-xml-rpc-server'
158-
// sh './provisionw sag-infradc'
159-
// // sh './provisionw sag-onedata'
160-
// }
161-
// post {
162-
// always {
163-
// sh 'docker-compose down'
164-
// }
165-
// }
166-
// }
248+
sh './provisionw sag-abe'
249+
250+
sh './provisionw sag-designer-services'
251+
sh './provisionw sag-designer-cloudstreams'
252+
253+
// sh './provisionw sag-onedata'
254+
}
255+
post {
256+
always {
257+
sh 'docker-compose down'
258+
}
259+
}
260+
}
261+
stage('Group EntireX') {
262+
when {
263+
anyOf {
264+
expression { return params.TEST }
265+
changeset "templates/sag-exx-**"
266+
}
267+
}
268+
agent { label 'docker' }
269+
environment {
270+
CC_ENV = 'dev'
271+
}
272+
steps {
273+
sh 'docker-compose pull cc'
274+
sh 'docker-compose up -V -d --remove-orphans cc'
275+
276+
sh './provisionw sag-exx-broker'
277+
sh './provisionw sag-exx-c-rpc-server'
278+
sh './provisionw sag-exx-java-rpc-server'
279+
sh './provisionw sag-exx-xml-rpc-server'
280+
sh './provisionw sag-exx-csl-rpc-server'
281+
sh './provisionw sag-exx-ims-rpc-server'
282+
sh './provisionw sag-exx-mf-broker'
283+
sh './provisionw sag-exx-mq-rpc-server'
284+
sh './provisionw sag-exx-net-rpc-server'
285+
}
286+
post {
287+
always {
288+
sh 'docker-compose down'
289+
}
290+
}
291+
}
167292
}
168293
}
169294
stage("Build Images") {
@@ -184,26 +309,26 @@ pipeline {
184309
}
185310
}
186311
}
187-
// stage('Group 2') {
188-
// agent { label 'docker' }
189-
// steps {
190-
// dir ('containers') {
191-
// sh 'docker-compose config'
192-
// sh 'docker-compose build --no-cache --force-rm asset-builder microservices-runtime cloud-streams'
193-
// sh 'docker-compose push asset-builder microservices-runtime cloud-streams'
194-
// }
195-
// }
196-
// }
197-
// stage('Group 3') {
198-
// agent { label 'docker' }
199-
// steps {
200-
// dir ('containers') {
201-
// sh 'docker-compose config'
202-
// sh 'docker-compose build --no-cache --force-rm entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
203-
// sh 'docker-compose push entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
204-
// }
205-
// }
206-
// }
312+
stage('Group 2') {
313+
agent { label 'docker' }
314+
steps {
315+
dir ('containers') {
316+
sh 'docker-compose config'
317+
sh 'docker-compose build --no-cache --force-rm asset-builder microservices-runtime cloud-streams'
318+
sh 'docker-compose push asset-builder microservices-runtime cloud-streams'
319+
}
320+
}
321+
}
322+
stage('Group 3') {
323+
agent { label 'docker' }
324+
steps {
325+
dir ('containers') {
326+
sh 'docker-compose config'
327+
sh 'docker-compose build --no-cache --force-rm entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
328+
sh 'docker-compose push entirex-broker entirex-java-rpc-server entirex-xml-rpc-server'
329+
}
330+
}
331+
}
207332
}
208333
}
209334
stage("Deploy") {

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ Template alias | Provisions Platform Manager
4949
Template alias | Description
5050
-------------------------|--------------------------------
5151
[sag-db-oracle](templates/sag-db-oracle) | Creates a user, database, and webMethods database schemas on an Oracle database server.
52-
[sag-db-sqlserver](templates/sag-db-sqlserver) | Creates a user, database, and webMethods database schemas on an SQL Server database server.
52+
[sag-db-sqlserver](templates/sag-db-sqlserver) | Creates a user, database, and webMethods database schemas on a SQL Server database server.
53+
[sag-db-mysql](templates/sag-db-mysql) | Creates a user, database, and webMethods database schemas on a MySQL database server.
5354

5455
### Micro Templates for provisioning Software AG products
5556

@@ -75,8 +76,8 @@ Template alias | Provisions
7576
[sag-is-cloudstreams](templates/sag-is-applatform) | Cloudstreams on Integration Server or Microservices runtime
7677
[sag-is-applatform](templates/sag-is-applatform) | Application Platform on Integration Server or Microservices runtime
7778
[sag-msc-server](templates/sag-msc-server) | webMethods Microservices Runtime
78-
[sag-mws-server](templates/sag-mws-server) | My webMethods server
79-
[sag-mws-infradc](templates/sag-mws-server) | Infrastructure Data Collector UI on My webMethods server
79+
<!-- [sag-mws-server](templates/sag-mws-server) | My webMethods server
80+
[sag-mws-infradc](templates/sag-mws-server) | Infrastructure Data Collector UI on My webMethods server -->
8081
[sag-tc-server](templates/sag-tc-server) | Terracotta BigMemory server
8182
[sag-tc-cluster](templates/sag-tc-cluster) | Terracotta BigMemory cluster
8283
[sag-tdb-server](templates/sag-tdb-server) | Terracotta DB server

‎environments/mysql/env.properties‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
###############################################################################
2+
# Copyright � 2013 - 2018 Software AG, Darmstadt, Germany and/or its licensors
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
###############################################################################
19+
# properties for local development/testing on TRUNK
20+
21+
db.host=mysql
22+
db.type=mysql
23+
db.username=webm
24+
db.password=webm
25+
db.name=webm
26+
db.url="jdbc:mysql://mysql:3306/webm"
27+
db.admin.password=root
28+
db.admin.username=root
29+
30+
um.fixes=[]
31+
um.url=nsp://localhost:9000
32+
tc.fixes=[]
33+
is.fixes=[]
34+
is.um.url=nsp://localhost:9000
35+
des.fixes=[]
36+
des.um.url=nsp://localhost:9000
37+
apama.fixes=[]
38+
cst.fixes=[]
39+
infradc.jms.host=localhost
40+
infradc.fixes=[]
41+
mws.infradcui.fixes=[]

‎environments/sqlserver/env.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ cst.fixes=[]
3838
infradc.jms.host=localhost
3939
infradc.fixes=[]
4040
mws.infradcui.fixes=[]
41+
mws.applatform.fixes=[]

0 commit comments

Comments
 (0)