Skip to content

Commit a4d0383

Browse files
ArneLimburgArneLimburg
committed
Configure deployments
1 parent 99ff0c2 commit a4d0383

5 files changed

Lines changed: 51 additions & 69 deletions

File tree

‎billing-service/Jenkinsfile‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ pipeline {
3333
script {
3434
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
3535
sh "mvn versions:set -DnewVersion=${env.RELEASE_VERSION} -B"
36-
sh "sed -i 's/${env.SNAPSHOT_VERSION}/${env.RELEASE_VERSION}/g' deployment/overlays/prod/kustomization.yaml"
37-
} else {
38-
sh "sed -i 's/${env.SNAPSHOT_VERSION}/${env.GIT_COMMIT}/g' deployment/overlays/test/kustomization.yaml"
3936
}
4037
}
4138
sh 'mvn clean test-compile -B'
@@ -64,8 +61,7 @@ pipeline {
6461
}
6562
}
6663
steps {
67-
sh 'mvn package -Dmaven.test.skip=true -B'
68-
sh 'docker build -t billing .'
64+
sh 'mvn package meecrowave:bundle -Dservice.name=billing-service -DskipTests -B'
6965
}
7066
}
7167
stage ('Push') {
@@ -78,24 +74,24 @@ pipeline {
7874
}
7975
}
8076
steps {
81-
sh """
82-
docker tag billing localhost:30010/billing:${env.VERSION}
83-
docker tag billing localhost:30010/billing:${env.BRANCH_NAME == 'main' ? 'stable' : 'latest'}
84-
docker tag billing localhost:30010/billing:${env.GIT_COMMIT}
85-
docker push localhost:30010/billing:${env.VERSION}
86-
docker push localhost:30010/billing:${env.BRANCH_NAME == 'main' ? 'stable' : 'latest'}
87-
docker push localhost:30010/billing:${env.GIT_COMMIT}
88-
"""
8977
script {
9078
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
91-
sh 'git config --global user.name "Jenkins"'
92-
sh 'git config --global user.email "ci@openknowledge.de"'
93-
sh "mvn scm:checkin -Dmessage='release of version ${env.RELEASE_VERSION}' -B"
94-
sh "mvn scm:tag -Dtag=${env.RELEASE_VERSION} -B"
79+
sh """
80+
sshpass -p 'jenkins' ssh -o "StrictHostKeyChecking=no" -p 2222 -q jenkins@prod 'mkdir -p ~/artifacts/billing-service/${env.VERSION}/'
81+
sshpass -p 'jenkins' scp -o "StrictHostKeyChecking=no" -P 2222 -q target/billing-service*.zip jenkins@prod:/config/artifacts/billing-service/${env.VERSION}/
82+
git config --global user.name 'Jenkins'
83+
git config --global user.email 'ci@openknowledge.de'
84+
mvn scm:checkin -Dmessage='release of version ${env.RELEASE_VERSION}' -B
85+
mvn scm:tag -Dtag=${env.RELEASE_VERSION} -B
86+
"""
9587
int nextRevision = Integer.parseInt(env.RELEASE_VERSION.substring(env.RELEASE_VERSION.lastIndexOf(".") + 1)) + 1
9688
nextVersion = RELEASE_VERSION.substring(0, env.RELEASE_VERSION.lastIndexOf(".")) + "." + nextRevision + "-SNAPSHOT"
97-
sh "sed -i 's/${env.RELEASE_VERSION}/${nextVersion}/g' deployment/overlays/prod/kustomization.yaml"
9889
sh "mvn versions:set scm:checkin -DnewVersion=${nextVersion} -Dmessage='update version to ${nextVersion}' -B"
90+
} else {
91+
sh """
92+
sshpass -p 'jenkins' ssh -o "StrictHostKeyChecking=no" -p 2222 -q jenkins@test 'mkdir -p ~/artifacts/billing-service/${env.VERSION}/'
93+
sshpass -p 'jenkins' scp -o "StrictHostKeyChecking=no" -P 2222 -q target/address-validation-service*.zip jenkins@test:/config/artifacts/billing-service/${env.VERSION}/
94+
"""
9995
}
10096
}
10197
}
@@ -112,11 +108,9 @@ pipeline {
112108
steps {
113109
script {
114110
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
115-
sh "mvn scm:checkout -DscmVersion=${env.RELEASE_VERSION} -DscmVersionType=tag -B"
116-
sh 'kubectl apply -k deployment/overlays/prod'
111+
sh "sshpass -p 'jenkins' ssh -o 'StrictHostKeyChecking=no' -p 2222 -q jenkins:jenkins@prod '[ -f ~/billing-service-distribution/bin/meecrowave.sh ] && ~/billing-service-distribution/bin/meecrowave.sh stop && rm -rf ~/billing-service-distribution/; unzip ~/artifacts/billing-service/${env.RELEASE_VERSION}/billing-service-meecrowave-distribution.zip -d ~/; nohup ~/billing-service-distribution/bin/meecrowave.sh start --http=8082'"
117112
} else {
118-
sh 'kubectl apply -k deployment/overlays/test'
119-
sh "sed -i 's/${env.GIT_COMMIT}/${env.SNAPSHOT_VERSION}/g' deployment/overlays/test/kustomization.yaml"
113+
sh "sshpass -p 'jenkins' ssh -o 'StrictHostKeyChecking=no' -p 2222 -q jenkins:jenkins@test '[ -f ~/billing-service-distribution/bin/meecrowave.sh ] && ~/billing-service-distribution/bin/meecrowave.sh stop && rm -rf ~/billing-service-distribution/; unzip ~/artifacts/billing-service/${env.SNAPSHOT_VERSION}/billing-service-meecrowave-distribution.zip -d ~/; nohup ~/billing-service-distribution/bin/meecrowave.sh start --http=8082'"
120114
}
121115
}
122116
}

‎customer-service/Jenkinsfile‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ pipeline {
3333
script {
3434
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
3535
sh "mvn versions:set -DnewVersion=${env.RELEASE_VERSION} -B"
36-
sh "sed -i 's/${env.SNAPSHOT_VERSION}/${env.RELEASE_VERSION}/g' deployment/overlays/prod/kustomization.yaml"
37-
} else {
38-
sh "sed -i 's/${env.SNAPSHOT_VERSION}/${env.GIT_COMMIT}/g' deployment/overlays/test/kustomization.yaml"
3936
}
4037
}
4138
sh 'mvn clean test-compile -B'
@@ -64,8 +61,7 @@ pipeline {
6461
}
6562
}
6663
steps {
67-
sh 'mvn package -DskipTests -B'
68-
sh 'docker build -t customer .'
64+
sh 'mvn package meecrowave:bundle -Dservice.name=customer-service -DskipTests -B'
6965
}
7066
}
7167
stage ('Push') {
@@ -78,24 +74,24 @@ pipeline {
7874
}
7975
}
8076
steps {
81-
sh """
82-
docker tag customer localhost:30010/customer:${env.VERSION}
83-
docker tag customer localhost:30010/customer:${env.BRANCH_NAME == 'main' ? 'stable' : 'latest'}
84-
docker tag customer localhost:30010/customer:${env.GIT_COMMIT}
85-
docker push localhost:30010/customer:${env.VERSION}
86-
docker push localhost:30010/customer:${env.BRANCH_NAME == 'main' ? 'stable' : 'latest'}
87-
docker push localhost:30010/customer:${env.GIT_COMMIT}
88-
"""
8977
script {
9078
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
91-
sh 'git config --global user.name "Jenkins"'
92-
sh 'git config --global user.email "ci@openknowledge.de"'
93-
sh "mvn scm:checkin -Dmessage='release of version ${env.RELEASE_VERSION}' -B"
94-
sh "mvn scm:tag -Dtag=${env.RELEASE_VERSION} -B"
79+
sh """
80+
sshpass -p 'jenkins' ssh -o "StrictHostKeyChecking=no" -p 2222 -q jenkins@prod 'mkdir -p ~/artifacts/customer-service/${env.VERSION}/'
81+
sshpass -p 'jenkins' scp -o "StrictHostKeyChecking=no" -P 2222 -q target/customer-service*.zip jenkins@prod:/config/artifacts/customer-service/${env.VERSION}/
82+
git config --global user.name 'Jenkins'
83+
git config --global user.email 'ci@openknowledge.de'
84+
mvn scm:checkin -Dmessage='release of version ${env.RELEASE_VERSION}' -B
85+
mvn scm:tag -Dtag=${env.RELEASE_VERSION} -B
86+
"""
9587
int nextRevision = Integer.parseInt(env.RELEASE_VERSION.substring(env.RELEASE_VERSION.lastIndexOf(".") + 1)) + 1
9688
nextVersion = RELEASE_VERSION.substring(0, env.RELEASE_VERSION.lastIndexOf(".")) + "." + nextRevision + "-SNAPSHOT"
97-
sh "sed -i 's/${env.RELEASE_VERSION}/${nextVersion}/g' deployment/overlays/prod/kustomization.yaml"
9889
sh "mvn versions:set scm:checkin -DnewVersion=${nextVersion} -Dmessage='update version to ${nextVersion}' -B"
90+
} else {
91+
sh """
92+
sshpass -p 'jenkins' ssh -o "StrictHostKeyChecking=no" -p 2222 -q jenkins@test 'mkdir -p ~/artifacts/customer-service/${env.VERSION}/'
93+
sshpass -p 'jenkins' scp -o "StrictHostKeyChecking=no" -P 2222 -q target/customer-service*.zip jenkins@test:/config/artifacts/customer-service/${env.VERSION}/
94+
"""
9995
}
10096
}
10197
}
@@ -112,11 +108,9 @@ pipeline {
112108
steps {
113109
script {
114110
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
115-
sh "mvn scm:checkout -DscmVersion=${env.RELEASE_VERSION} -DscmVersionType=tag -B"
116-
sh 'kubectl apply -k deployment/overlays/prod'
111+
sh "sshpass -p 'jenkins' ssh -o 'StrictHostKeyChecking=no' -p 2222 -q jenkins:jenkins@prod '[ -f ~/customer-service-distribution/bin/meecrowave.sh ] && ~/customer-service-distribution/bin/meecrowave.sh stop && rm -rf ~/customer-service-distribution/; unzip ~/artifacts/customer-service/${env.RELEASE_VERSION}/customer-service-meecrowave-distribution.zip -d ~/; nohup ~/customer-service-distribution/bin/meecrowave.sh start --http=8081'"
117112
} else {
118-
sh 'kubectl apply -k deployment/overlays/test'
119-
sh "sed -i 's/${env.GIT_COMMIT}/${env.SNAPSHOT_VERSION}/g' deployment/overlays/test/kustomization.yaml"
113+
sh "sshpass -p 'jenkins' ssh -o 'StrictHostKeyChecking=no' -p 2222 -q jenkins:jenkins@test '[ -f ~/customer-service-distribution/bin/meecrowave.sh ] && ~/customer-service-distribution/bin/meecrowave.sh stop && rm -rf ~/customer-service-distribution/; unzip ~/artifacts/customer-service/${env.SNAPSHOT_VERSION}/customer-service-meecrowave-distribution.zip -d ~/; nohup ~/customer-service-distribution/bin/meecrowave.sh start --http=8081'"
120114
}
121115
}
122116
}

‎customer-service/src/main/resources/META-INF/microprofile-config.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
billing-service.url=http://localhost:4001
2-
delivery-service.url=http://localhost:4002
1+
billing-service.url=http://localhost:8082
2+
delivery-service.url=http://localhost:8083

‎delivery-service/Jenkinsfile‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ pipeline {
3333
script {
3434
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
3535
sh "mvn versions:set -DnewVersion=${env.RELEASE_VERSION} -B"
36-
sh "sed -i 's/${env.SNAPSHOT_VERSION}/${env.RELEASE_VERSION}/g' deployment/overlays/prod/kustomization.yaml"
37-
} else {
38-
sh "sed -i 's/${env.SNAPSHOT_VERSION}/${env.GIT_COMMIT}/g' deployment/overlays/test/kustomization.yaml"
3936
}
4037
}
4138
sh 'mvn clean test-compile -B'
@@ -64,8 +61,7 @@ pipeline {
6461
}
6562
}
6663
steps {
67-
sh 'mvn package -DskipTests -B'
68-
sh 'docker build -t delivery .'
64+
sh 'mvn package meecrowave:bundle -Dservice.name=delivery-service -DskipTests -B'
6965
}
7066
}
7167
stage ('Push') {
@@ -78,24 +74,24 @@ pipeline {
7874
}
7975
}
8076
steps {
81-
sh """
82-
docker tag delivery localhost:30010/delivery:${env.VERSION}
83-
docker tag delivery localhost:30010/delivery:${env.BRANCH_NAME == 'main' ? 'stable' : 'latest'}
84-
docker tag delivery localhost:30010/delivery:${env.GIT_COMMIT}
85-
docker push localhost:30010/delivery:${env.VERSION}
86-
docker push localhost:30010/delivery:${env.BRANCH_NAME == 'main' ? 'stable' : 'latest'}
87-
docker push localhost:30010/delivery:${env.GIT_COMMIT}
88-
"""
8977
script {
9078
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
91-
sh 'git config --global user.name "Jenkins"'
92-
sh 'git config --global user.email "ci@openknowledge.de"'
93-
sh "mvn scm:checkin -Dmessage='release of version ${env.RELEASE_VERSION}' -B"
94-
sh "mvn scm:tag -Dtag=${env.RELEASE_VERSION} -B"
79+
sh """
80+
sshpass -p 'jenkins' ssh -o "StrictHostKeyChecking=no" -p 2222 -q jenkins@prod 'mkdir -p ~/artifacts/delivery-service/${env.VERSION}/'
81+
sshpass -p 'jenkins' scp -o "StrictHostKeyChecking=no" -P 2222 -q target/delivery-service*.zip jenkins@prod:/config/artifacts/delivery-service/${env.VERSION}/
82+
git config --global user.name 'Jenkins'
83+
git config --global user.email 'ci@openknowledge.de'
84+
mvn scm:checkin -Dmessage='release of version ${env.RELEASE_VERSION}' -B
85+
mvn scm:tag -Dtag=${env.RELEASE_VERSION} -B
86+
"""
9587
int nextRevision = Integer.parseInt(env.RELEASE_VERSION.substring(env.RELEASE_VERSION.lastIndexOf(".") + 1)) + 1
9688
nextVersion = RELEASE_VERSION.substring(0, env.RELEASE_VERSION.lastIndexOf(".")) + "." + nextRevision + "-SNAPSHOT"
97-
sh "sed -i 's/${env.RELEASE_VERSION}/${nextVersion}/g' deployment/overlays/prod/kustomization.yaml"
9889
sh "mvn versions:set scm:checkin -DnewVersion=${nextVersion} -Dmessage='update version to ${nextVersion}' -B"
90+
} else {
91+
sh """
92+
sshpass -p 'jenkins' ssh -o "StrictHostKeyChecking=no" -p 2222 -q jenkins@test 'mkdir -p ~/artifacts/delivery-service/${env.VERSION}/'
93+
sshpass -p 'jenkins' scp -o "StrictHostKeyChecking=no" -P 2222 -q target/delivery-service*.zip jenkins@test:/config/artifacts/delivery-service/${env.VERSION}/
94+
"""
9995
}
10096
}
10197
}
@@ -112,11 +108,9 @@ pipeline {
112108
steps {
113109
script {
114110
if (env.PERFORM_RELEASE.equals('true') && !env.RELEASE_VERSION.equals(env.SNAPSHOT_VERSION)) {
115-
sh "mvn scm:checkout -DscmVersion=${env.RELEASE_VERSION} -DscmVersionType=tag -B"
116-
sh 'kubectl apply -k deployment/overlays/prod'
111+
sh "sshpass -p 'jenkins' ssh -o 'StrictHostKeyChecking=no' -p 2222 -q jenkins:jenkins@prod '[ -f ~/delivery-service-distribution/bin/meecrowave.sh ] && ~/delivery-service-distribution/bin/meecrowave.sh stop && rm -rf ~/delivery-service-distribution/; unzip ~/artifacts/delivery-service/${env.RELEASE_VERSION}/delivery-service-meecrowave-distribution.zip -d ~/; nohup ~/delivery-service-distribution/bin/meecrowave.sh start --http=8083'"
117112
} else {
118-
sh 'kubectl apply -k deployment/overlays/test'
119-
sh "sed -i 's/${env.GIT_COMMIT}/${env.SNAPSHOT_VERSION}/g' deployment/overlays/test/kustomization.yaml"
113+
sh "sshpass -p 'jenkins' ssh -o 'StrictHostKeyChecking=no' -p 2222 -q jenkins:jenkins@test '[ -f ~/delivery-service-distribution/bin/meecrowave.sh ] && ~/delivery-service-distribution/bin/meecrowave.sh stop && rm -rf ~/delivery-service-distribution/; unzip ~/artifacts/delivery-service/${env.SNAPSHOT_VERSION}/delivery-service-meecrowave-distribution.zip -d ~/; nohup ~/delivery-service-distribution/bin/meecrowave.sh start --http=8083'"
120114
}
121115
}
122116
}

‎delivery-service/src/main/resources/META-INF/microprofile-config.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
address-validation-service.url=http://localhost:4003
1+
address-validation-service.url=http://localhost:8084

0 commit comments

Comments
 (0)