From 74350b74c4c9cfd887364d5037ceec4ce471a727 Mon Sep 17 00:00:00 2001 From: dhruvsonagara Date: Fri, 8 Mar 2024 17:27:03 +0530 Subject: [PATCH 1/4] [PHEE-534] enable parallel execution --- helm/ph-ee-engine/templates/tests/integration-test-ams.yaml | 2 +- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml index 6992f47ba..0112179cb 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml @@ -13,7 +13,7 @@ spec: imagePullPolicy: "Always" command: [ "/bin/bash" , "-c" ] args: - - ./gradlew test -Dcucumber.filter.tags="@amsIntegration" ; echo 'Test complete' ; sleep 1500 ; echo 'pod terminate' + - ./gradlew test -Dcucumber.tags="@amsIntegration" ; echo 'Test complete' ; sleep 1500 ; echo 'pod terminate' {{- include "inttest.env" . | nindent 4 }} resources: limits: diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index 40be17baf..b64cfe6ea 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -14,7 +14,7 @@ spec: command: [ "/bin/bash" , "-c" ] args: # - ./gradlew test -Dcucumber.filter.tags="@bd012" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' - - ./gradlew test -Dcucumber.filter.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' + - ./gradlew test -Dcucumber.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' {{- include "inttest.env" . | nindent 4 }} resources: limits: From f37c21f27ef96f133c1bd83f3f5bdb3a0f344954 Mon Sep 17 00:00:00 2001 From: dhruvsonagara Date: Fri, 8 Mar 2024 17:35:31 +0530 Subject: [PATCH 2/4] [PHEE-534] enable parallel execution --- .circleci/config.yml | 102 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a96eb7f31..4058ef1b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -243,66 +243,66 @@ jobs: kubectl create namespace paymenthub kubectl get -A namespace - # # For remote access to minikube uncomment the following lines. - # #---------------------minikube remote aceess start--------------------- - # sudo apt install nginx - # sudo touch /etc/nginx/conf.d/minikube.conf - # echo "create nginx conf" - # sudo chmod 777 -R /etc/nginx/conf.d/ - # echo "changed access" + # For remote access to minikube uncomment the following lines. + #---------------------minikube remote aceess start--------------------- + sudo apt install nginx + sudo touch /etc/nginx/conf.d/minikube.conf + echo "create nginx conf" + sudo chmod 777 -R /etc/nginx/conf.d/ + echo "changed access" - # sudo apt-get install apache2-utils -y - # echo "apache2-utils installed" - # htpasswd -bc /home/circleci/project/.htpasswd minikube minikube + sudo apt-get install apache2-utils -y + echo "apache2-utils installed" + htpasswd -bc /home/circleci/project/.htpasswd minikube minikube - # sudo cat \< /etc/nginx/conf.d/minikube.conf - # server { - # listen 8080; - # listen [::]:8080; - # server_name localhost; - # access_log /home/circleci/project/nginx_access.log; - # auth_basic "Administrators Area"; - # auth_basic_user_file /home/circleci/project/.htpasswd; + sudo cat \< /etc/nginx/conf.d/minikube.conf + server { + listen 8080; + listen [::]:8080; + server_name localhost; + access_log /home/circleci/project/nginx_access.log; + auth_basic "Administrators Area"; + auth_basic_user_file /home/circleci/project/.htpasswd; - # location / { - # proxy_pass https://$MINIKUBE_IP:8443; - # proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; - # proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; - # } - # } - # EOF - # sudo service nginx restart || echo 'start nginx' - # #SYSTEMD_LESS=FRXMK systemctl status nginx.service + location / { + proxy_pass https://$MINIKUBE_IP:8443; + proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; + proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; + } + } + EOF + sudo service nginx restart || echo 'start nginx' + #SYSTEMD_LESS=FRXMK systemctl status nginx.service - # sleep 10 + sleep 10 - # echo "test-nginx-proxy" - # curl -u minikube:minikube http://localhost:8080 + echo "test-nginx-proxy" + curl -u minikube:minikube http://localhost:8080 - # curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - # # ngrok config add-authtoken $AUTH_TOKEN - # echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml - # ngrok http 8080 > /dev/null & + curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok + ngrok config add-authtoken 2Zo2HVFOaaiyCIQ6ICNzBtzkfCB_4MW1T7uMsNnXgJxra4ssi + echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml + ngrok http 8080 > /dev/null & - # echo -n "Extracting ngrok public url ." - # NGROK_PUBLIC_URL="" - # while [ -z "$NGROK_PUBLIC_URL" ]; do - # # Run 'curl' against ngrok API and extract public (using 'sed' command) - # export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ - # --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ - # sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') - # sleep 1 - # echo -n "." - # done - # echo ---------copy the below public_URL for NGrok---------- - # echo "https://$NGROK_PUBLIC_URL" - # echo "https://$NGROK_PUBLIC_URL" + echo -n "Extracting ngrok public url ." + NGROK_PUBLIC_URL="" + while [ -z "$NGROK_PUBLIC_URL" ]; do + # Run 'curl' against ngrok API and extract public (using 'sed' command) + export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ + --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ + sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') + sleep 1 + echo -n "." + done + echo ---------copy the below public_URL for NGrok---------- + echo "https://$NGROK_PUBLIC_URL" + echo "https://$NGROK_PUBLIC_URL" - # #echo "test ngrok " - # #curl -u minikube:minikube https://$NGROK_PUBLIC_URL - # echo "https://$NGROK_PUBLIC_URL" + #echo "test ngrok " + #curl -u minikube:minikube https://$NGROK_PUBLIC_URL + echo "https://$NGROK_PUBLIC_URL" - # # ---------------------minikube remote aceess end--------------------- + # ---------------------minikube remote aceess end--------------------- curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null sudo apt-get install apt-transport-https --yes From 1041dc6f707d5ce9af21d83c6bdfa318f1863201 Mon Sep 17 00:00:00 2001 From: dhruvsonagara Date: Fri, 8 Mar 2024 17:41:49 +0530 Subject: [PATCH 3/4] Updated the config indent --- .circleci/config.yml | 102 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4058ef1b6..ea61910c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -243,66 +243,66 @@ jobs: kubectl create namespace paymenthub kubectl get -A namespace - # For remote access to minikube uncomment the following lines. - #---------------------minikube remote aceess start--------------------- - sudo apt install nginx - sudo touch /etc/nginx/conf.d/minikube.conf - echo "create nginx conf" - sudo chmod 777 -R /etc/nginx/conf.d/ - echo "changed access" + # For remote access to minikube uncomment the following lines. + #---------------------minikube remote aceess start--------------------- + sudo apt install nginx + sudo touch /etc/nginx/conf.d/minikube.conf + echo "create nginx conf" + sudo chmod 777 -R /etc/nginx/conf.d/ + echo "changed access" - sudo apt-get install apache2-utils -y - echo "apache2-utils installed" - htpasswd -bc /home/circleci/project/.htpasswd minikube minikube + sudo apt-get install apache2-utils -y + echo "apache2-utils installed" + htpasswd -bc /home/circleci/project/.htpasswd minikube minikube - sudo cat \< /etc/nginx/conf.d/minikube.conf - server { - listen 8080; - listen [::]:8080; - server_name localhost; - access_log /home/circleci/project/nginx_access.log; - auth_basic "Administrators Area"; - auth_basic_user_file /home/circleci/project/.htpasswd; + sudo cat \< /etc/nginx/conf.d/minikube.conf + server { + listen 8080; + listen [::]:8080; + server_name localhost; + access_log /home/circleci/project/nginx_access.log; + auth_basic "Administrators Area"; + auth_basic_user_file /home/circleci/project/.htpasswd; - location / { - proxy_pass https://$MINIKUBE_IP:8443; - proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; - proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; - } - } - EOF - sudo service nginx restart || echo 'start nginx' - #SYSTEMD_LESS=FRXMK systemctl status nginx.service + location / { + proxy_pass https://$MINIKUBE_IP:8443; + proxy_ssl_certificate /home/circleci/.minikube/profiles/minikube/client.crt; + proxy_ssl_certificate_key /home/circleci/.minikube/profiles/minikube/client.key; + } + } + EOF + sudo service nginx restart || echo 'start nginx' + #SYSTEMD_LESS=FRXMK systemctl status nginx.service - sleep 10 + sleep 10 - echo "test-nginx-proxy" - curl -u minikube:minikube http://localhost:8080 + echo "test-nginx-proxy" + curl -u minikube:minikube http://localhost:8080 - curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok - ngrok config add-authtoken 2Zo2HVFOaaiyCIQ6ICNzBtzkfCB_4MW1T7uMsNnXgJxra4ssi - echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml - ngrok http 8080 > /dev/null & + curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok + ngrok config add-authtoken 2Zo2HVFOaaiyCIQ6ICNzBtzkfCB_4MW1T7uMsNnXgJxra4ssi + echo "web_addr: $LOCAL_PORT" >> /home/circleci/.config/ngrok/ngrok.yml + ngrok http 8080 > /dev/null & - echo -n "Extracting ngrok public url ." - NGROK_PUBLIC_URL="" - while [ -z "$NGROK_PUBLIC_URL" ]; do - # Run 'curl' against ngrok API and extract public (using 'sed' command) - export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ - --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ - sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') - sleep 1 - echo -n "." - done - echo ---------copy the below public_URL for NGrok---------- - echo "https://$NGROK_PUBLIC_URL" - echo "https://$NGROK_PUBLIC_URL" + echo -n "Extracting ngrok public url ." + NGROK_PUBLIC_URL="" + while [ -z "$NGROK_PUBLIC_URL" ]; do + # Run 'curl' against ngrok API and extract public (using 'sed' command) + export NGROK_PUBLIC_URL=$(curl --silent --max-time 10 --connect-timeout 5 \ + --show-error http://127.0.0.1:$LOCAL_PORT/api/tunnels | \ + sed -nE 's/.*public_url":"https:..([^"]*).*/\1/p') + sleep 1 + echo -n "." + done + echo ---------copy the below public_URL for NGrok---------- + echo "https://$NGROK_PUBLIC_URL" + echo "https://$NGROK_PUBLIC_URL" - #echo "test ngrok " - #curl -u minikube:minikube https://$NGROK_PUBLIC_URL - echo "https://$NGROK_PUBLIC_URL" + #echo "test ngrok " + #curl -u minikube:minikube https://$NGROK_PUBLIC_URL + echo "https://$NGROK_PUBLIC_URL" - # ---------------------minikube remote aceess end--------------------- + # ---------------------minikube remote aceess end--------------------- curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null sudo apt-get install apt-transport-https --yes From 9fb320e05409598e614bded4cb8e44099ace2832 Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Wed, 3 Apr 2024 12:06:47 +0530 Subject: [PATCH 4/4] sleep time --- helm/ph-ee-engine/templates/tests/integration-test-ams.yaml | 2 +- helm/ph-ee-engine/templates/tests/integration-test-gov.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml index 0112179cb..c4cdb618f 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-ams.yaml @@ -13,7 +13,7 @@ spec: imagePullPolicy: "Always" command: [ "/bin/bash" , "-c" ] args: - - ./gradlew test -Dcucumber.tags="@amsIntegration" ; echo 'Test complete' ; sleep 1500 ; echo 'pod terminate' + - ./gradlew test -Dcucumber.tags="@amsIntegration" ; echo 'Test complete' ; sleep 1000 ; echo 'pod terminate' {{- include "inttest.env" . | nindent 4 }} resources: limits: diff --git a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml index b64cfe6ea..f1e969dce 100644 --- a/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml +++ b/helm/ph-ee-engine/templates/tests/integration-test-gov.yaml @@ -14,7 +14,7 @@ spec: command: [ "/bin/bash" , "-c" ] args: # - ./gradlew test -Dcucumber.filter.tags="@bd012" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' - - ./gradlew test -Dcucumber.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 300 ; echo 'pod terminate' + - ./gradlew test -Dcucumber.tags="@gov and not @ext" ; echo 'Test complete' ; sleep 150 ; echo 'pod terminate' {{- include "inttest.env" . | nindent 4 }} resources: limits: