Skip to content

Commit 138cce2

Browse files
Pogrebnyak, SergeiPogrebnyak, Sergei
Pogrebnyak, Sergei
authored and
Pogrebnyak, Sergei
committed
Two test groups are unstable
1 parent 3fe34d0 commit 138cce2

File tree

5 files changed

+84
-76
lines changed

5 files changed

+84
-76
lines changed

‎Jenkinsfile‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -77,66 +77,66 @@ pipeline {
7777
}
7878
}
7979
parallel {
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-
}
89-
agent { label 'docker' }
90-
environment {
91-
CC_ENV = 'oracle'
92-
}
93-
steps {
94-
sh 'docker-compose pull cc'
95-
sh 'docker-compose up -V -d --remove-orphans cc'
96-
sh 'docker-compose -f templates/sag-db-oracle/docker-compose.yml up -d 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+
// }
89+
// agent { label 'docker' }
90+
// environment {
91+
// CC_ENV = 'oracle'
92+
// }
93+
// steps {
94+
// sh 'docker-compose pull cc'
95+
// sh 'docker-compose up -V -d --remove-orphans cc'
96+
// sh 'docker-compose -f templates/sag-db-oracle/docker-compose.yml up -d oracle'
9797

98-
sh './provisionw sag-db-oracle'
99-
sh './provisionw sag-infradc'
100-
sh './provisionw sag-optimize-analysis'
101-
sh './provisionw sag-optimize-wsdc'
102-
}
103-
post {
104-
always {
105-
sh 'docker-compose -f templates/sag-db-oracle/docker-compose.yml down'
106-
sh 'docker-compose down'
107-
}
108-
}
109-
}
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-
}
118-
agent { label 'docker' }
119-
environment {
120-
CC_ENV = 'sqlserver'
121-
}
122-
steps {
123-
sh 'docker-compose pull cc'
124-
sh 'docker-compose up -V -d --remove-orphans cc'
125-
sh 'docker-compose -f templates/sag-db-sqlserver/docker-compose.yml up -d sqlserver'
98+
// sh './provisionw sag-db-oracle'
99+
// sh './provisionw sag-infradc'
100+
// sh './provisionw sag-optimize-analysis'
101+
// sh './provisionw sag-optimize-wsdc'
102+
// }
103+
// post {
104+
// always {
105+
// sh 'docker-compose -f templates/sag-db-oracle/docker-compose.yml down'
106+
// sh 'docker-compose down'
107+
// }
108+
// }
109+
// }
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+
// }
118+
// agent { label 'docker' }
119+
// environment {
120+
// CC_ENV = 'sqlserver'
121+
// }
122+
// steps {
123+
// sh 'docker-compose pull cc'
124+
// sh 'docker-compose up -V -d --remove-orphans cc'
125+
// sh 'docker-compose -f templates/sag-db-sqlserver/docker-compose.yml up -d sqlserver'
126126

127-
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'
132-
}
133-
post {
134-
always {
135-
sh 'docker-compose -f templates/sag-db-sqlserver/docker-compose.yml down'
136-
sh 'docker-compose down'
137-
}
138-
}
139-
}
127+
// 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'
132+
// }
133+
// post {
134+
// always {
135+
// sh 'docker-compose -f templates/sag-db-sqlserver/docker-compose.yml down'
136+
// sh 'docker-compose down'
137+
// }
138+
// }
139+
// }
140140
stage('Group MySQL / DAP') {
141141
when {
142142
anyOf {
@@ -154,6 +154,7 @@ pipeline {
154154
sh 'docker-compose pull cc'
155155
sh 'docker-compose up -V -d --remove-orphans cc'
156156
sh 'docker-compose -f templates/sag-db-mysql/docker-compose.yml up -d mysql'
157+
157158
sh './provisionw sag-db-mysql'
158159
sh './provisionw sag-is-cluster db.type=mysqlce'
159160
sh './provisionw sag-is-config'

‎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

‎templates/sag-optimize-analysis/test.sh‎

100644100755
File mode changed.

‎templates/sag-optimize-wsdc/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616
limitations under the License.
1717
1818
-->
19+
1920
# Optimize Web Service Data Collector
2021

22+
> STATUS: INCUBATING
23+
2124
Use this template to install Optimize Web Service Data Collector 10.1 and higher.
2225

2326
## Requirements

‎templates/sag-optimize-wsdc/test.sh‎

100644100755
Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,31 @@
1818
#
1919
#*******************************************************************************
2020

21+
2122
# if managed image
22-
export CC_SERVER=http://localhost:8092/spm
23+
if [ -d $SAG_HOME/profiles/SPM ] ; then
24+
export CC_SERVER=http://localhost:8092/spm
2325

24-
echo "Verifying managed container $CC_SERVER ..."
25-
sagcc get inventory products -e SPM --wait-for-cc
26+
echo "Verifying managed container $CC_SERVER ..."
27+
sagcc get inventory products -e SPM --wait-for-cc
2628

27-
export CC_WAIT=5
28-
echo "Verifying fixes ..."
29-
sagcc get inventory fixes
29+
export CC_WAIT=5
30+
echo "Verifying fixes ..."
31+
sagcc get inventory fixes
3032

31-
echo "Verifying instances ..."
32-
sagcc get inventory components -e optimizeWSDataCollector-dataCollector
33+
echo "Verifying instances ..."
34+
sagcc get inventory components -e optimizeWSDataCollector-dataCollector
3335

34-
echo "Verifying configs ..."
35-
sagcc get configuration instances optimizeWSDataCollector-dataCollector COMMON-COMPONENT-ENDPOINTS-JMS-Provider -e JMS-Provider
36-
sagcc get configuration instances optimizeWSDataCollector-dataCollector COMMON-COMPONENT-ENDPOINTS-Configuration-Agent -e Configuration-Agent
37-
sagcc get configuration instances optimizeWSDataCollector-dataCollector COMMON-COMPONENT-ENDPOINTS-WS-Registry -e WS-Registry
36+
echo "Verifying configs ..."
37+
sagcc get configuration instances optimizeWSDataCollector-dataCollector COMMON-COMPONENT-ENDPOINTS-JMS-Provider -e JMS-Provider
38+
sagcc get configuration instances optimizeWSDataCollector-dataCollector COMMON-COMPONENT-ENDPOINTS-Configuration-Agent -e Configuration-Agent
39+
sagcc get configuration instances optimizeWSDataCollector-dataCollector COMMON-COMPONENT-ENDPOINTS-WS-Registry -e WS-Registry
3840

39-
echo "Verifying status ..."
40-
sagcc get monitoring runtimestatus optimizeWSDataCollector-dataCollector -e ONLINE
41+
echo "Verifying status ..."
42+
sagcc get monitoring runtimestatus optimizeWSDataCollector-dataCollector -e ONLINE
43+
fi
4144

4245
echo "Verifying product runtime ..."
4346
curl -H Accept:text http://localhost:12603/services/WSProcessDataCollector.wsdl
4447

45-
echo "DONE testing"
48+
echo "TEST SUCCESSFUL"

0 commit comments

Comments
 (0)