update apps to pact-tags

openknowledge · Nov 7, 2024 · c732329 · c732329
1 parent f12d80f
commit c732329
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 8 deletions.
diff --git a/address-validation-service/Jenkinsfile b/address-validation-service/Jenkinsfile
@@ -17,6 +17,7 @@ pipeline {
         RELEASE_VERSION = "${env.SNAPSHOT_VERSION.contains('-SNAPSHOT') ? env.SNAPSHOT_VERSION.substring(0, env.SNAPSHOT_VERSION.lastIndexOf('-SNAPSHOT')) : SNAPSHOT_VERSION}"
         VERSION = "${env.BRANCH_NAME == 'main' && !env.LAST_COMMIT_MESSAGE.startsWith('update version to ') ? env.RELEASE_VERSION : env.SNAPSHOT_VERSION}"
         ROOT_DIRECTORY = "${params.verifyPacts == true && env.BRANCH_NAME == 'main' && env.SNAPSHOT_VERSION.endsWith("-SNAPSHOT") ? 'target/checkout' : '.'}"
+        STAGE = "${env.BRANCH_NAME == 'main' ? 'prod' : 'test'}"
     }
 
     triggers {
@@ -71,7 +72,7 @@ pipeline {
             steps {
                 sh """
                     cd ${ROOT_DIRECTORY}
-                    mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B
+                    mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -Dpact.tag=${params.verifyPacts ? 'pending-' + env.STAGE : env.STAGE} -B
                 """
             }
         }
@@ -149,6 +150,8 @@ pipeline {
                             && ~/address-validation-service-distribution/bin/meecrowave.sh start"
                         """
                     }
+                    sh "curl -H 'Content-Type: application/json' -X PUT http://pact-service:8080/pacticipants/address-validation-service/versions/${env.VERSION}/tags/${env.STAGE}"
+                    sh "curl -X DELETE http://pact-service:8080/pacticipants/address-validation-service/versions/${env.VERSION}/tags/pending-${env.STAGE}"
                 }
             }
         }

diff --git a/address-validation-service/pom.xml b/address-validation-service/pom.xml
@@ -26,6 +26,7 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <pactBroker.url>http://localhost:5000</pactBroker.url>
+        <pact.tag>develop</pact.tag>
         <meecrowave.version>1.2.13</meecrowave.version>
         <junit.version>5.8.2</junit.version>
     </properties>
@@ -84,6 +85,7 @@
                 <configuration>
                     <systemPropertyVariables>
                         <pact.provider.version>${project.version}</pact.provider.version>
+                        <pact.tag>${pact.tag}</pact.tag>
                         <pactBroker.url>${pactBroker.url}</pactBroker.url>
                     </systemPropertyVariables>
                 </configuration>

diff --git a/...n-service/src/test/java/de/openknowledge/sample/address/AddressValidationServiceTest.java b/...n-service/src/test/java/de/openknowledge/sample/address/AddressValidationServiceTest.java
@@ -31,10 +31,11 @@
 import au.com.dius.pact.provider.junitsupport.Provider;
 import au.com.dius.pact.provider.junitsupport.State;
 import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
+import au.com.dius.pact.provider.junitsupport.loader.VersionSelector;
 
 @IgnoreNoPactsToVerify
 @Provider("address-validation-service")
-@PactBroker(url = "${pactBroker.url:http://localhost:5000}")
+@PactBroker(url = "${pactBroker.url:http://localhost:5000}", consumerVersionSelectors = @VersionSelector(tag = "${pact.tag}"))
 @MonoMeecrowaveConfig
 public class AddressValidationServiceTest {
 

diff --git a/billing-service/Jenkinsfile b/billing-service/Jenkinsfile
@@ -17,6 +17,7 @@ pipeline {
         RELEASE_VERSION = "${env.SNAPSHOT_VERSION.contains('-SNAPSHOT') ? env.SNAPSHOT_VERSION.substring(0, env.SNAPSHOT_VERSION.lastIndexOf('-SNAPSHOT')) : SNAPSHOT_VERSION}"
         VERSION = "${env.BRANCH_NAME == 'main' && !env.LAST_COMMIT_MESSAGE.startsWith('update version to ') ? env.RELEASE_VERSION : env.SNAPSHOT_VERSION}"
         ROOT_DIRECTORY = "${params.verifyPacts == true && env.BRANCH_NAME == 'main' && env.SNAPSHOT_VERSION.endsWith("-SNAPSHOT") ? 'target/checkout' : '.'}"
+        STAGE = "${env.BRANCH_NAME == 'main' ? 'prod' : 'test'}"
     }
 
     triggers {
@@ -71,7 +72,7 @@ pipeline {
             steps {
                 sh """
                     cd ${ROOT_DIRECTORY}
-                    mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B
+                    mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -Dpact.tag=${params.verifyPacts ? 'pending-' + env.STAGE : env.STAGE} -B
                 """
             }
         }
@@ -149,6 +150,8 @@ pipeline {
                             && ~/billing-service-distribution/bin/meecrowave.sh start"
                         """
                     }
+                    sh "curl -H 'Content-Type: application/json' -X PUT http://pact-service:8080/pacticipants/billing-service/versions/${env.VERSION}/tags/${env.STAGE}"
+                    sh "curl -X DELETE http://pact-service:8080/pacticipants/billing-service/versions/${env.VERSION}/tags/pending-${env.STAGE}"
                 }
             }
         }

diff --git a/billing-service/pom.xml b/billing-service/pom.xml
@@ -27,6 +27,7 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <pactBroker.url>http://localhost:5000</pactBroker.url>
+        <pact.tag>develop</pact.tag>
         <meecrowave.version>1.2.13</meecrowave.version>
         <junit.version>5.8.2</junit.version>
     </properties>
@@ -90,6 +91,7 @@
                 <configuration>
                     <systemPropertyVariables>
                         <pact.provider.version>${project.version}</pact.provider.version>
+                        <pact.tag>${pact.tag}</pact.tag>
                         <pactBroker.url>${pactBroker.url}</pactBroker.url>
                     </systemPropertyVariables>
                 </configuration>

diff --git a/billing-service/src/test/java/de/openknowledge/sample/address/BillingAddressServiceTest.java b/billing-service/src/test/java/de/openknowledge/sample/address/BillingAddressServiceTest.java
@@ -31,10 +31,11 @@
 import au.com.dius.pact.provider.junitsupport.Provider;
 import au.com.dius.pact.provider.junitsupport.State;
 import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
+import au.com.dius.pact.provider.junitsupport.loader.VersionSelector;
 
 @IgnoreNoPactsToVerify
 @Provider("billing-service")
-@PactBroker(url = "${pactBroker.url:http://localhost:5000}")
+@PactBroker(url = "${pactBroker.url:http://localhost:5000}", consumerVersionSelectors = @VersionSelector(tag = "${pact.tag}"))
 @MonoMeecrowaveConfig
 public class BillingAddressServiceTest {
 

diff --git a/customer-service/Jenkinsfile b/customer-service/Jenkinsfile
@@ -12,6 +12,7 @@ pipeline {
         PERFORM_RELEASE = "${env.SNAPSHOT_VERSION.contains('-SNAPSHOT') && env.BRANCH_NAME == 'main' && !env.LAST_COMMIT_MESSAGE.startsWith('update version to ')}"
         RELEASE_VERSION = "${env.SNAPSHOT_VERSION.contains('-SNAPSHOT') ? env.SNAPSHOT_VERSION.substring(0, env.SNAPSHOT_VERSION.lastIndexOf('-SNAPSHOT')) : SNAPSHOT_VERSION}"
         VERSION = "${env.BRANCH_NAME == 'main' && !env.LAST_COMMIT_MESSAGE.startsWith('update version to ') ? env.RELEASE_VERSION : env.SNAPSHOT_VERSION}"
+        STAGE = "${env.BRANCH_NAME == 'main' ? 'prod' : 'test'}"
     }
 
     triggers {
@@ -48,7 +49,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'mvn test pact:publish -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B'
+                sh 'mvn test pact:publish -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -Dpact.consumer.tags=pending-${env.STAGE} -B'
             }
         }
         stage ('Test providers') {
@@ -136,8 +137,11 @@ pipeline {
                             && ~/customer-service-distribution/bin/meecrowave.sh start"
                         """
                     }
+                    sh "curl -H 'Content-Type: application/json' -X PUT http://pact-service:8080/pacticipants/customer-service/versions/${env.VERSION}/tags/${env.STAGE}"
+                    sh "curl -X DELETE http://pact-service:8080/pacticipants/customer-service/versions/${env.VERSION}/tags/pending-${env.STAGE}"
                 }
             }
         }
     }
 }
+
diff --git a/delivery-service/Jenkinsfile b/delivery-service/Jenkinsfile
@@ -17,6 +17,7 @@ pipeline {
         RELEASE_VERSION = "${env.SNAPSHOT_VERSION.contains('-SNAPSHOT') ? env.SNAPSHOT_VERSION.substring(0, env.SNAPSHOT_VERSION.lastIndexOf('-SNAPSHOT')) : SNAPSHOT_VERSION}"
         VERSION = "${env.BRANCH_NAME == 'main' && !env.LAST_COMMIT_MESSAGE.startsWith('update version to ') ? env.RELEASE_VERSION : env.SNAPSHOT_VERSION}"
         ROOT_DIRECTORY = "${params.verifyPacts == true && env.BRANCH_NAME == 'main' && env.SNAPSHOT_VERSION.endsWith("-SNAPSHOT") ? 'target/checkout' : '.'}"
+        STAGE = "${env.BRANCH_NAME == 'main' ? 'prod' : 'test'}"
     }
 
     triggers {
@@ -71,7 +72,7 @@ pipeline {
             steps {
                 sh """
                     cd ${ROOT_DIRECTORY}
-                    mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B
+                    mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -Dpact.tag=${params.verifyPacts ? 'pending-' + env.STAGE : env.STAGE} -B
                 """
             }
         }
@@ -88,7 +89,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'mvn pact:publish -DpactBroker.url=http://pact-service:8080 -Dpact.verifier.publishResults=true -B'
+                sh "mvn pact:publish -DpactBroker.url=http://pact-service:8080 -Dpact.verifier.publishResults=true -Dpact.consumer.tags=pending-${env.STAGE} -B"
                 build job: "address-validation-service/${env.BRANCH_NAME}", parameters: [booleanParam(name: 'verifyPacts', value: true)]
             }
         }
@@ -166,6 +167,8 @@ pipeline {
                             && ~/delivery-service-distribution/bin/meecrowave.sh start"
                         """
                     }
+                    sh "curl -H 'Content-Type: application/json' -X PUT http://pact-service:8080/pacticipants/delivery-service/versions/${env.VERSION}/tags/${env.STAGE}"
+                    sh "curl -X DELETE http://pact-service:8080/pacticipants/delivery-service/versions/${env.VERSION}/tags/pending-${env.STAGE}"
                 }
             }
         }

diff --git a/delivery-service/pom.xml b/delivery-service/pom.xml
@@ -28,6 +28,7 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <pactBroker.url>http://localhost:5000</pactBroker.url>
+        <pact.tag>develop</pact.tag>
         <meecrowave.version>1.2.13</meecrowave.version>
         <deltaspike.version>1.9.6</deltaspike.version>
         <hibernate.version>5.4.21.Final</hibernate.version>
@@ -199,6 +200,7 @@
                 <configuration>
                     <systemPropertyVariables>
                         <pact.provider.version>${project.version}</pact.provider.version>
+                        <pact.tag>${pact.tag}</pact.tag>
                         <pactBroker.url>${pactBroker.url}</pactBroker.url>
                         <javax.persistence.jdbc.url>jdbc:h2:mem:delivery</javax.persistence.jdbc.url>
                         <javax.persistence.jdbc.driver>org.h2.Driver</javax.persistence.jdbc.driver>

diff --git a/...ery-service/src/test/java/de/openknowledge/sample/address/DeliveryAddressServiceTest.java b/...ery-service/src/test/java/de/openknowledge/sample/address/DeliveryAddressServiceTest.java
@@ -43,13 +43,14 @@
 import au.com.dius.pact.provider.junitsupport.State;
 import au.com.dius.pact.provider.junitsupport.StateChangeAction;
 import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
+import au.com.dius.pact.provider.junitsupport.loader.VersionSelector;
 import de.openknowledge.sample.address.domain.AddressValidationService;
 import rocks.limburg.cdimock.MockitoBeans;
 
 @IgnoreNoPactsToVerify
 @MockitoBeans(types = {AddressValidationService.class})
 @Provider("delivery-service")
-@PactBroker(url = "${pactBroker.url:http://localhost:5000}")
+@PactBroker(url = "${pactBroker.url:http://localhost:5000}", consumerVersionSelectors = @VersionSelector(tag = "${pact.tag}"))
 @MonoMeecrowaveConfig
 public class DeliveryAddressServiceTest {