Adding license from vault and applying it

Signed-off-by: Yashvi Jain <[email protected]>
chef · May 13, 2024 · bb28920 · bb28920
1 parent 49b9886
commit bb28920
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/.expeditor/verify_private.pipeline.yml b/.expeditor/verify_private.pipeline.yml
@@ -163,9 +163,9 @@ steps:
       - . scripts/verify_setup.sh
       - echo "\$A2_LICENSE" > dev/license.jwt
       - |
-        hab studio run "source scripts/verify_studio_init.sh &&
-          start_deployment_service &&
-          chef-automate dev deploy-some chef/automate-load-balancer --with-deps &&
+        hab studio run "source scripts/verify_studio_init.sh && echo "\$A2_LICENSE" > /src/dev/license.jwt &&
+          start_deployment_service && 
+          chef-automate dev deploy-some chef/automate-load-balancer --with-deps && chef-automate license apply /src/dev/license.jwt &&
           automate_load_balancer_integration"
     timeout_in_minutes: 20
     retry:
@@ -317,9 +317,9 @@ steps:
     command:
       - . scripts/verify_setup.sh
       - |
-        hab studio run "source scripts/verify_studio_init.sh &&
+        hab studio run "source scripts/verify_studio_init.sh && echo "\$A2_LICENSE" > /src/dev/license.jwt &&
           start_deployment_service &&
-          chef-automate dev deployinate &&
+          chef-automate dev deployinate && chef-automate license apply /src/dev/license.jwt &&
           gateway_integration"
     timeout_in_minutes: 20
     retry:

diff --git a/.studio/automate-gateway b/.studio/automate-gateway
@@ -14,7 +14,6 @@ document "gateway_integration" <<DOC
   Runs the integration tests for automate-gateway
 DOC
 function gateway_integration() {
-  apply_license
   install_if_missing core/curl curl
 
   set -o pipefail # don't let the jq-pipe ruin the return 1
@@ -59,9 +58,6 @@ function gateway_integration() {
   set +o pipefail # reset
 }
 
-function apply_license(){
-    chef-automate license apply "$A2_LICENSE"
-}
 
 document "get_service_versions" <<DOC
   Get all the service versions running in automate

diff --git a/.studio/automate-load-balancer b/.studio/automate-load-balancer
@@ -25,9 +25,3 @@ automate_load_balancer_integration() {
   status="$(curl -fsS --insecure -H "api-token: ${api_token}" "${target}/api/v0/status")"
   jq -ne --argjson status "$status" '$status.ok' || return 1
 }
-
-
-function apply_license(){
-  license=${A2_LICENSE-default}
-    chef-automate license apply license
-}