Merge pull request #3265 from pubudu538/beta-release

Preparing for 1.2.0-beta release
wso2 · Feb 21, 2023 · 284fcb5 · 284fcb5
2 parents 6893cfa + 399c750
commit 284fcb5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/dev-scripts/remove-containers.sh b/dev-scripts/remove-containers.sh
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------------
 
 # Just to assist developers by removing all the containers.
-cc_version=1.2.0-beta-SNAPSHOT
+cc_version=1.2.0-beta
 
 docker kill "$(docker ps -a | grep wso2/choreo-connect-enforcer:$cc_version | awk '{print $1}')"
 docker rm "$(docker ps -a | grep wso2/choreo-connect-enforcer:$cc_version | awk '{print $1}')"

diff --git a/integration/test-integration/src/test/resources/dockerCompose/cc-cacert-mounted-mtls.yaml b/integration/test-integration/src/test/resources/dockerCompose/cc-cacert-mounted-mtls.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/choreo-connect-router:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -32,7 +32,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -51,7 +51,7 @@ services:
       - "18000:18000"
       - "9843:9843"
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.2.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/...est-integration/src/test/resources/dockerCompose/cc-in-common-network-docker-compose.yaml b/...est-integration/src/test/resources/dockerCompose/cc-in-common-network-docker-compose.yaml
@@ -7,7 +7,7 @@ networks:
       name: apim_and_cc
 services:
   router:
-    image: wso2/choreo-connect-router:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -35,7 +35,7 @@ services:
     networks:
       - cc_internal
   adapter:
-    image: wso2/choreo-connect-adapter:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -58,7 +58,7 @@ services:
       - cc_internal
       - apim_and_cc
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.2.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/resources/docker-compose/apim/docker-compose.yaml b/resources/docker-compose/apim/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
     volumes:
       - ./conf/deployment.toml:/home/wso2carbon/wso2-config-volume/repository/conf/deployment.toml
   router:
-    image: wso2/choreo-connect-router:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -42,7 +42,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -62,7 +62,7 @@ services:
     links:
       - apim
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.2.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/resources/docker-compose/docker-compose.yaml b/resources/docker-compose/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/choreo-connect-router:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-router:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -31,7 +31,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/choreo-connect-adapter:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-adapter:1.2.0-beta
     logging:
       options:
         max-size: "20m"
@@ -50,7 +50,7 @@ services:
       - "18000:18000"
       - "9843:9843"
   enforcer:
-    image: wso2/choreo-connect-enforcer:1.2.0-beta-SNAPSHOT
+    image: wso2/choreo-connect-enforcer:1.2.0-beta
     logging:
       options:
         max-size: "20m"

diff --git a/resources/k8s-artifacts/choreo-connect/adapter-deployment.yaml b/resources/k8s-artifacts/choreo-connect/adapter-deployment.yaml
@@ -47,7 +47,7 @@ spec:
             - mountPath: /home/wso2/conf/log_config.toml
               subPath: log_config.toml
               name: logconfig-toml-vol
-          image: wso2/choreo-connect-adapter:1.2.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-adapter:1.2.0-beta
           imagePullPolicy: IfNotPresent
           env:
             - name: ADAPTER_PRIVATE_KEY_PATH

diff --git a/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml
@@ -40,7 +40,7 @@ spec:
             - mountPath: /home/wso2/conf/log4j2.properties
               subPath: log4j2.properties
               name: log4j2-vol
-          image: wso2/choreo-connect-enforcer:1.2.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-enforcer:1.2.0-beta
           imagePullPolicy: IfNotPresent
           env:
             - name: ENFORCER_PRIVATE_KEY_PATH
@@ -104,7 +104,7 @@ spec:
               name: router-keystore-vol
             - mountPath: /home/wso2/security/truststore
               name: router-truststore-vol
-          image: wso2/choreo-connect-router:1.2.0-beta-SNAPSHOT
+          image: wso2/choreo-connect-router:1.2.0-beta
           imagePullPolicy: IfNotPresent
           env:
             - name: ROUTER_ADMIN_HOST