From 69b2b9f0628f876f98bbfe7966b3d873402bfcbd Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:18:30 +0530 Subject: [PATCH 1/8] updating docker url in services file --- .circleci/services.txt | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/services.txt b/.circleci/services.txt index af17a708..7bde5858 100644 --- a/.circleci/services.txt +++ b/.circleci/services.txt @@ -1,22 +1,22 @@ -ph-ee-g2psandbox.ph-ee-engine.community-app.image docker.io/openmf/community-app -ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_ams_mifos.image docker.io/openmf/ph-ee-connector-ams-mifos -ph-ee-g2psandbox.ph-ee-engine.connector_bulk.image docker.io/openmf/ph-ee-bulk-processor -ph-ee-g2psandbox.ph-ee-engine.importer_rdbms.image docker.io/openmf/ph-ee-importer-rdbms -ph-ee-g2psandbox.ph-ee-engine.channel.image docker.io/openmf/ph-ee-connector-channel -ph-ee-g2psandbox.ph-ee-engine.messagegateway.image docker.io/openmf/message-gateway -ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_gsma.image docker.io/openmf/ph-ee-connector-gsma -ph-ee-g2psandbox.ph-ee-engine.mockpayment.image docker.io/openmf/ph-ee-connector-mock-payment-schema -ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_mojaloop.image docker.io/openmf/ph-ee-connector-mojaloop -ph-ee-g2psandbox.ph-ee-engine.notifications.image docker.io/openmf/ph-ee-notifications -ph-ee-g2psandbox.account_mapper.image docker.io/openmf/ph-ee-identity-account-mapper -ph-ee-g2psandbox.ph-ee-engine.importer_es.image docker.io/openmf/ph-ee-importer-es -ph-ee-g2psandbox.ph-ee-engine.operations_app.image docker.io/openmf/ph-ee-operations-app -ph-ee-g2psandbox.ph-ee-engine.operations_web.image docker.io/openmf/ph-ee-operations-web -ph-ee-g2psandbox.ph-ee-engine.vouchers.image docker.io/openmf/ph-ee-vouchers -ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_slcb.image docker.io/openmf/ph-ee-connector-slcb -ph-ee-g2psandbox.ph-ee-engine.mpesa.image openmf/ph-ee-connector-mpesa -ph-ee-g2psandbox.ph-ee-engine.crm.image openmf/ph-ee-connector-crm -ph-ee-g2psandbox.ph-ee-engine.billPay.image openmf/ph-ee-bill-pay -ph-ee-g2psandbox.ph-ee-engine.connector.image openmf/ph-ee-connector-bulk -ph-ee-g2psandbox.ph-ee-engine.integration_test.image openmf/ph-ee-integration-test -ph-ee-g2psandbox.ph-ee-engine.zeebe_ops.image openmf/ph-ee-zeebe-ops \ No newline at end of file +ph-ee-g2psandbox.ph-ee-engine.community-app.image docker.io/fynarfin/community-app +ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_ams_mifos.image docker.io/fynarfin/ph-ee-connector-ams-mifos +ph-ee-g2psandbox.ph-ee-engine.connector_bulk.image docker.io/fynarfin/ph-ee-bulk-processor +ph-ee-g2psandbox.ph-ee-engine.importer_rdbms.image docker.io/fynarfin/ph-ee-importer-rdbms +ph-ee-g2psandbox.ph-ee-engine.channel.image docker.io/fynarfin/ph-ee-connector-channel +ph-ee-g2psandbox.ph-ee-engine.messagegateway.image docker.io/fynarfin/message-gateway +ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_gsma.image docker.io/fynarfin/ph-ee-connector-gsma +ph-ee-g2psandbox.ph-ee-engine.mockpayment.image docker.io/fynarfin/ph-ee-connector-mock-payment-schema +ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_mojaloop.image docker.io/fynarfin/ph-ee-connector-mojaloop +ph-ee-g2psandbox.ph-ee-engine.notifications.image docker.io/fynarfin/ph-ee-notifications +ph-ee-g2psandbox.account_mapper.image docker.io/fynarfin/ph-ee-identity-account-mapper +ph-ee-g2psandbox.ph-ee-engine.importer_es.image docker.io/fynarfin/ph-ee-importer-es +ph-ee-g2psandbox.ph-ee-engine.operations_app.image docker.io/fynarfin/ph-ee-operations-app +ph-ee-g2psandbox.ph-ee-engine.operations_web.image docker.io/fynarfin/ph-ee-operations-web +ph-ee-g2psandbox.ph-ee-engine.vouchers.image docker.io/fynarfin/ph-ee-vouchers +ph-ee-g2psandbox.ph-ee-engine.ph_ee_connector_slcb.image docker.io/fynarfin/ph-ee-connector-slcb +ph-ee-g2psandbox.ph-ee-engine.mpesa.image fynarfin/ph-ee-connector-mpesa +ph-ee-g2psandbox.ph-ee-engine.crm.image fynarfin/ph-ee-connector-crm +ph-ee-g2psandbox.ph-ee-engine.billPay.image fynarfin/ph-ee-bill-pay +ph-ee-g2psandbox.ph-ee-engine.connector.image fynarfin/ph-ee-connector-bulk +ph-ee-g2psandbox.ph-ee-engine.integration_test.image fynarfin/ph-ee-integration-test +ph-ee-g2psandbox.ph-ee-engine.zeebe_ops.image fynarfin/ph-ee-zeebe-ops \ No newline at end of file From 8c31e8456d2e2e5d8d78afee964bce7fc7ec7ef4 Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:25:01 +0530 Subject: [PATCH 2/8] Update docker url, orb and default branch --- .circleci/config.yml | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02554fbc..2efc4072 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: helm: circleci/helm@2.0.1 aws-eks: circleci/aws-eks@2.2.0 kubernetes: circleci/kubernetes@1.3 - mifos-orb: mifos/docker-image-availability-check-and-upgrade@1.0.0 + fynarfin-orb: fynarfin/docker-image-availability-check-and-upgrade@1.0.1 jobs: build: docker: @@ -24,9 +24,9 @@ jobs: JIRA_STORY: '' JIRA_STORY_DIR: '' command: | - if [ "$CIRCLE_BRANCH" != "master" ]; then + if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi echo Charts will save in https://fynarfin.io/images$JIRA_STORY_DIR @@ -68,9 +68,9 @@ jobs: JIRA_STORY: '' JIRA_STORY_DIR: '' command: | - if [ "$CIRCLE_BRANCH" != "master" ]; then + if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi echo Charts will save in https://fynarfin.io/images$JIRA_STORY_DIR @@ -100,7 +100,7 @@ jobs: environment: TERM: dumb steps: - - mifos-orb/docker-image-availability-check-and-upgrade: + - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: paymenthub chart-base-url: https://fynarfin.io/images chart-name: ph-ee-g2psandbox-fynarfin @@ -110,7 +110,7 @@ jobs: # add-repo: "https://fynarfin.io/images/ph-ee-g2psandbox-fynarfin" cluster-name: "sit" aws-region: "$REGION" - service-file-path: https://raw.githubusercontent.com/openMF/ph-ee-env-labs/master/.circleci/services.txt + service-file-path: https://raw.githubusercontent.com/fynarfin/ph-ee-env-labs/develop/.circleci/services.txt host-g2-sandbox-security-fynarfin-chart: docker: @@ -129,9 +129,9 @@ jobs: JIRA_STORY: '' JIRA_STORY_DIR: '' command: | - if [ "$CIRCLE_BRANCH" != "master" ]; then + if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi fi @@ -168,7 +168,7 @@ jobs: if ! kubectl get ns ph-infrastructure > /dev/null 2>&1; then kubectl create namespace ph-infrastructure fi - - mifos-orb/docker-image-availability-check-and-upgrade: + - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: ph-infrastructure chart-base-url: https://fynarfin.io/images chart-name: ph-ee-g2psandbox-security-fynarfin @@ -178,7 +178,7 @@ jobs: release-name: g2p-sandbox-security cluster-name: "sit" aws-region: "$REGION" - service-file-path: https://raw.githubusercontent.com/openMF/ph-ee-env-labs/master/.circleci/services.txt + service-file-path: https://raw.githubusercontent.com/fynarfin/ph-ee-env-labs/develop/.circleci/services.txt host-dpga-compliance-barebone-chart: docker: @@ -204,9 +204,9 @@ jobs: JIRA_STORY: '' JIRA_STORY_DIR: '' command: | - if [ "$CIRCLE_BRANCH" != "master" ]; then + if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi fi @@ -241,7 +241,7 @@ jobs: if ! kubectl get ns paymenthub-dpg > /dev/null 2>&1; then kubectl create namespace paymenthub-dpg fi - - mifos-orb/docker-image-availability-check-and-upgrade: + - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: paymenthub-dpg chart-base-url: https://fynarfin.io/images chart-name: dpga-barebone @@ -251,7 +251,7 @@ jobs: release-name: dpga-release cluster-name: "sit" aws-region: "$REGION" - service-file-path: https://raw.githubusercontent.com/openMF/ph-ee-env-labs/master/.circleci/services.txt + service-file-path: https://raw.githubusercontent.com/fynarfin/ph-ee-env-labs/develop/.circleci/services.txt host-g2p-sandbox-fynarfin-demo-chart: docker: @@ -277,9 +277,9 @@ jobs: JIRA_STORY: '' JIRA_STORY_DIR: '' command: | - if [ "$CIRCLE_BRANCH" != "master" ]; then + if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/openmf/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi fi @@ -316,7 +316,7 @@ jobs: fi - run: "kubectl delete clusterroles `kubectl get clusterroles |grep c-role|cut -d ' ' -f1` || echo ' ' " - run: "kubectl delete clusterrolebinding `kubectl get clusterrolebinding |grep c-role|cut -d ' ' -f1` || echo ' ' " - - mifos-orb/docker-image-availability-check-and-upgrade: + - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: paymenthub-demo chart-base-url: https://fynarfin.io/images chart-name: ph-ee-g2psandbox-fynarfin-demo @@ -324,7 +324,7 @@ jobs: release-name: g2p-sandbox-demo cluster-name: "sit" aws-region: "$REGION" - service-file-path: https://raw.githubusercontent.com/openMF/ph-ee-env-labs/master/.circleci/services.txt + service-file-path: https://raw.githubusercontent.com/fynarfin/ph-ee-env-labs/develop/.circleci/services.txt deploying-bpmns-demo-namespace: docker: @@ -338,7 +338,7 @@ jobs: echo "Directory has not changed. Skipping the job." circleci step halt fi - - run: git clone https://github.com/openmf/ph-ee-env-labs + - run: git clone https://github.com/fynarfin/ph-ee-env-labs - run: echo $AWS_PROFILE - run: echo $AWS_DEFAULT_PROFILE - run: | @@ -360,7 +360,7 @@ jobs: - setup_remote_docker: version: 20.10.14 - kubernetes/install-kubectl - - run: git clone https://github.com/openmf/ph-ee-env-labs + - run: git clone https://github.com/fynarfin/ph-ee-env-labs - aws-eks/update-kubeconfig-with-authenticator: cluster-name: "sit" aws-region: "$REGION" @@ -407,18 +407,18 @@ jobs: docker: - image: cimg/openjdk:17.0.0 steps: - - run: git clone https://github.com/openmf/ph-ee-integration-test + - run: git clone https://github.com/fynarfin/ph-ee-integration-test - run: cd ph-ee-integration-test && ./gradlew test -Dcucumber.filter.tags="@gov" - store_test_results: - path: ph-ee-integration-test/build/test-results/test/TEST-org.mifos.integrationtest.TestRunner.xml + path: ph-ee-integration-test/build/test-results/test/TEST-org.fynarfin.integrationtest.TestRunner.xml test-chart-ams: docker: - image: cimg/openjdk:17.0.0 steps: - - run: git clone https://github.com/openmf/ph-ee-integration-test + - run: git clone https://github.com/fynarfin/ph-ee-integration-test - run: cd ph-ee-integration-test && ./gradlew test -Dcucumber.filter.tags="@amsIntegration" - store_test_results: - path: ph-ee-integration-test/build/test-results/test/TEST-org.mifos.integrationtest.TestRunner.xml + path: ph-ee-integration-test/build/test-results/test/TEST-org.fynarfin.integrationtest.TestRunner.xml workflows: deploy: From 144912058c0304f9eee751b1d5acba2ae3978a81 Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:56:49 +0530 Subject: [PATCH 3/8] Change orb version, fynarfin image url --- .circleci/config.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2efc4072..9f7ec022 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: helm: circleci/helm@2.0.1 aws-eks: circleci/aws-eks@2.2.0 kubernetes: circleci/kubernetes@1.3 - fynarfin-orb: fynarfin/docker-image-availability-check-and-upgrade@1.0.1 + fynarfin-orb: fynarfin/docker-image-availability-check-and-upgrade@1.0.2 jobs: build: docker: @@ -29,15 +29,15 @@ jobs: PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi - echo Charts will save in https://fynarfin.io/images$JIRA_STORY_DIR + echo Charts will save in https://fynarfin.io/images/fynarfin$JIRA_STORY_DIR fi - CHART_URL="https://fynarfin.io/images$JIRA_STORY_DIR/ph-ee-g2psandbox-0.0.0$JIRA_STORY" + CHART_URL="https://fynarfin.io/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-0.0.0$JIRA_STORY" if curl --output /dev/null --silent --head --fail "$CHART_URL"; then sed -i "11s@^ *repository:.*\$@ repository: $CHART_URL@" helm/g2p-sandbox-fynarfin-SIT/Chart.yaml sed -i "12s@^ *version:.*\$@ version: 0.0.0$JIRA_STORY@" helm/g2p-sandbox-fynarfin-SIT/Chart.yaml echo "chart used: < $CHART_URL >" else - CHART_URL="https://fynarfin.io/images/ph-ee-g2psandbox-0.0.0" + CHART_URL="https://fynarfin.io/images/fynarfin/ph-ee-g2psandbox-0.0.0" echo "chart used: < $CHART_URL >" fi sed -i "6s/.*/version: 0.2.0$JIRA_STORY/" helm/g2p-sandbox-fynarfin-SIT/Chart.yaml @@ -102,12 +102,12 @@ jobs: steps: - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: paymenthub - chart-base-url: https://fynarfin.io/images + chart-base-url: https://fynarfin.io/images/fynarfin chart-name: ph-ee-g2psandbox-fynarfin chart-version: 0.2.0 - # chart: "https://fynarfin.io/images/ph-ee-g2psandbox-fynarfin/ph-ee-g2psandbox-fynarfin-0.2.0.tgz" + # chart: "https://fynarfin.io/images/fynarfin/ph-ee-g2psandbox-fynarfin/ph-ee-g2psandbox-fynarfin-0.2.0.tgz" release-name: g2p-sandbox - # add-repo: "https://fynarfin.io/images/ph-ee-g2psandbox-fynarfin" + # add-repo: "https://fynarfin.io/images/fynarfin/ph-ee-g2psandbox-fynarfin" cluster-name: "sit" aws-region: "$REGION" service-file-path: https://raw.githubusercontent.com/fynarfin/ph-ee-env-labs/develop/.circleci/services.txt @@ -131,17 +131,17 @@ jobs: command: | if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi fi - CHART_URL="https://fynarfin.io/images$JIRA_STORY_DIR/ph-ee-g2psandbox-security$JIRA_STORY" + CHART_URL="https://fynarfin.io/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-security$JIRA_STORY" if curl --output /dev/null --silent --head --fail "$CHART_URL"; then sed -i "10s@^ *repository:.*\$@ repository: $CHART_URL@" helm/g2p-sandbox-security-fynarfin-SIT/Chart.yaml sed -i "11s@^ *version:.*\$@ version: 0.0.0$JIRA_STORY@" helm/g2p-sandbox-security-fynarfin-SIT/Chart.yaml echo "chart used: < $CHART_URL >" else - CHART_URL="https://fynarfin.io/images/ph-ee-g2psandbox-security" + CHART_URL="https://fynarfin.io/images/fynarfin/ph-ee-g2psandbox-security" echo "chart used: < $CHART_URL >" fi sed -i "5s/.*/version: 0.0.0$JIRA_STORY/" helm/g2p-sandbox-security-fynarfin-SIT/Chart.yaml @@ -170,11 +170,11 @@ jobs: fi - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: ph-infrastructure - chart-base-url: https://fynarfin.io/images + chart-base-url: https://fynarfin.io/images/fynarfin chart-name: ph-ee-g2psandbox-security-fynarfin chart-version: 0.0.0 - # chart: "https://fynarfin.io/images/ph-ee-g2psandbox-security-fynarfin/ph-ee-g2psandbox-security-fynarfin-0.0.0.tgz" - # add-repo: "https://fynarfin.io/images/ph-ee-g2psandbox-security-fynarfin" + # chart: "https://fynarfin.io/images/fynarfin/ph-ee-g2psandbox-security-fynarfin/ph-ee-g2psandbox-security-fynarfin-0.0.0.tgz" + # add-repo: "https://fynarfin.io/images/fynarfin/ph-ee-g2psandbox-security-fynarfin" release-name: g2p-sandbox-security cluster-name: "sit" aws-region: "$REGION" @@ -206,7 +206,7 @@ jobs: command: | if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi fi @@ -243,11 +243,11 @@ jobs: fi - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: paymenthub-dpg - chart-base-url: https://fynarfin.io/images + chart-base-url: https://fynarfin.io/images/fynarfin chart-name: dpga-barebone chart-version: 1.0.0 - # chart: "https://fynarfin.io/images/dpga-barebone/dpga-barebone-1.0.0.tgz" - # add-repo: "https://fynarfin.io/images/dpga-barebone" + # chart: "https://fynarfin.io/images/fynarfin/dpga-barebone/dpga-barebone-1.0.0.tgz" + # add-repo: "https://fynarfin.io/images/fynarfin/dpga-barebone" release-name: dpga-release cluster-name: "sit" aws-region: "$REGION" @@ -279,7 +279,7 @@ jobs: command: | if [ "$CIRCLE_BRANCH" != "develop" ]; then PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST) - PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PR_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') + PR_TITLE=$(curl -sSL "https://api.github.com/repos/fynarfin/$CIRCLE_PROJECT_REPONAME/pulls/$PR_NUMBER" | jq -r '.title') JIRA_STORY=-$(echo $PR_TITLE | cut -d "[" -f2 | cut -d "]" -f1 | tr '[A-Z]' '[a-z]') if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi fi @@ -318,7 +318,7 @@ jobs: - run: "kubectl delete clusterrolebinding `kubectl get clusterrolebinding |grep c-role|cut -d ' ' -f1` || echo ' ' " - fynarfin-orb/docker-image-availability-check-and-upgrade: namespace: paymenthub-demo - chart-base-url: https://fynarfin.io/images + chart-base-url: https://fynarfin.io/images/fynarfin chart-name: ph-ee-g2psandbox-fynarfin-demo chart-version: 1.0.0 release-name: g2p-sandbox-demo From 707a2a5627a1960d1c9f7b98d8e3a564f782c5cb Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:42:09 +0530 Subject: [PATCH 4/8] Update image url --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f7ec022..360d9ebc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,9 +47,9 @@ jobs: helm repo index . echo "$CERT_FILE" | base64 --decode > b64encoded.pem chmod 400 b64encoded.pem - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin$JIRA_STORY + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin$JIRA_STORY scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml ph-ee-g2psandbox-fynarfin-0.2.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin$JIRA_STORY index.yaml ph-ee-g2psandbox-fynarfin-0.2.0$JIRA_STORY.tgz + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin$JIRA_STORY index.yaml ph-ee-g2psandbox-fynarfin-0.2.0$JIRA_STORY.tgz build-g2p-sandbox-ci-chart: docker: - image: cimg/python:3.10 @@ -91,9 +91,9 @@ jobs: helm repo index . echo "$CERT_FILE" | base64 --decode > b64encoded.pem chmod 400 b64encoded.pem - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2p-sandbox-ci$JIRA_STORY + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2p-sandbox-ci$JIRA_STORY scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml ph-ee-g2p-sandbox-ci-0.0.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2p-sandbox-ci$JIRA_STORY index.yaml ph-ee-g2p-sandbox-ci-0.0.0$JIRA_STORY.tgz + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2p-sandbox-ci$JIRA_STORY index.yaml ph-ee-g2p-sandbox-ci-0.0.0$JIRA_STORY.tgz upgrade-g2psandbox-helm-chart: docker: - image: cimg/python:3.10 @@ -153,9 +153,9 @@ jobs: helm repo index . echo "$CERT_FILE" | base64 --decode > b64encoded.pem chmod 400 b64encoded.pem - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-security-fynarfin$JIRA_STORY + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-security-fynarfin$JIRA_STORY scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml ph-ee-g2psandbox-security-fynarfin-0.0.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-security-fynarfin$JIRA_STORY index.yaml ph-ee-g2psandbox-security-fynarfin-0.0.0$JIRA_STORY.tgz + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-security-fynarfin$JIRA_STORY index.yaml ph-ee-g2psandbox-security-fynarfin-0.0.0$JIRA_STORY.tgz upgrade-g2psandbox-security-helm-chart: docker: - image: cimg/python:3.10 @@ -217,9 +217,9 @@ jobs: helm repo index . echo "$CERT_FILE" | base64 --decode > b64encoded.pem chmod 400 b64encoded.pem - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/dpga-barebone$JIRA_STORY + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/dpga-barebone$JIRA_STORY scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml dpga-barebone-1.0.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/dpga-barebone$JIRA_STORY index.yaml dpga-barebone-1.0.0$JIRA_STORY.tgz + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/dpga-barebone$JIRA_STORY index.yaml dpga-barebone-1.0.0$JIRA_STORY.tgz upgrade-dpga-compliance-barebone-chart: docker: @@ -290,9 +290,9 @@ jobs: helm repo index . echo "$CERT_FILE" | base64 --decode > b64encoded.pem chmod 400 b64encoded.pem - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin-demo$JIRA_STORY + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mkdir -p /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin-demo$JIRA_STORY scp -o StrictHostKeyChecking=No -i b64encoded.pem index.yaml ph-ee-g2psandbox-fynarfin-demo-1.0.0$JIRA_STORY.tgz ec2-user@13.233.68.128:~/ - ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin-demo$JIRA_STORY index.yaml ph-ee-g2psandbox-fynarfin-demo-1.0.0$JIRA_STORY.tgz + ssh -i b64encoded.pem -o StrictHostKeyChecking=No ec2-user@13.233.68.128 sudo mv -t /apps/apache-tomcat-7.0.82/webapps/ROOT/images/fynarfin$JIRA_STORY_DIR/ph-ee-g2psandbox-fynarfin-demo$JIRA_STORY index.yaml ph-ee-g2psandbox-fynarfin-demo-1.0.0$JIRA_STORY.tgz upgrade-g2p-sandbox-fynarfin-demo-chart: docker: From 85db7e2bca46763d82e0e4d1c178089793b95fc7 Mon Sep 17 00:00:00 2001 From: Dhaval Maniyar <100835289+logoutdhaval@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:58:59 +0530 Subject: [PATCH 5/8] [phee-679] Update env-template pipline to use ph-ee-g2p-sandbox-ci chart. (#85) * Update env-template pipline to use ph-ee-g2p-sandbox-ci chart. * dummy * test * resource chage --- .circleci/config.yml | 2 +- helm/ph-ee-g2p-sandbox-ci/Chart.yaml | 6 ++--- .../{values_resource.yaml => values.yaml} | 25 ++++++++++--------- helm/ph-ee-g2p-sandbox-ci/values_p1.yaml | 18 ++----------- helm/ph-ee-g2p-sandbox-ci/values_p2.yaml | 24 +++++++----------- helm/ph-ee-g2p-sandbox-ci/values_p3.yaml | 12 --------- 6 files changed, 28 insertions(+), 59 deletions(-) rename helm/ph-ee-g2p-sandbox-ci/{values_resource.yaml => values.yaml} (93%) delete mode 100644 helm/ph-ee-g2p-sandbox-ci/values_p3.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 360d9ebc..04c8544d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ jobs: if [ -z "$JIRA_STORY" ]; then echo "Invalid PR title" && exit 1; else echo "Ticket NO: $JIRA_STORY" && JIRA_STORY_DIR=$(echo /jira-story-version); fi echo Charts will save in https://fynarfin.io/images$JIRA_STORY_DIR fi - CHART_URL="https://fynarfin.io/images$JIRA_STORY_DIR/ph-ee-g2p-sandbox-ci-0.0.0$JIRA_STORY" + CHART_URL="https://fynarfin.io/images$JIRA_STORY_DIR/ph-ee-g2psandbox-0.0.0$JIRA_STORY" if curl --output /dev/null --silent --head --fail "$CHART_URL"; then sed -i "11s@^ *repository:.*\$@ repository: $CHART_URL@" helm/ph-ee-g2p-sandbox-ci/Chart.yaml sed -i "12s@^ *version:.*\$@ version: 0.0.0$JIRA_STORY@" helm/ph-ee-g2p-sandbox-ci/Chart.yaml diff --git a/helm/ph-ee-g2p-sandbox-ci/Chart.yaml b/helm/ph-ee-g2p-sandbox-ci/Chart.yaml index 9e006fd2..f6e8b810 100644 --- a/helm/ph-ee-g2p-sandbox-ci/Chart.yaml +++ b/helm/ph-ee-g2p-sandbox-ci/Chart.yaml @@ -7,6 +7,6 @@ version: 0.0.0 appVersion: 0.0.0 dependencies: - - name: ph-ee-g2psandbox - repository: https://fynarfin.io/images/ph-ee-g2psandbox-0.0.0 - version: 0.0.0 +- name: ph-ee-g2psandbox + repository: https://fynarfin.io/images/ph-ee-g2psandbox-0.0.0 + version: 0.0.0 diff --git a/helm/ph-ee-g2p-sandbox-ci/values_resource.yaml b/helm/ph-ee-g2p-sandbox-ci/values.yaml similarity index 93% rename from helm/ph-ee-g2p-sandbox-ci/values_resource.yaml rename to helm/ph-ee-g2p-sandbox-ci/values.yaml index 5473451b..1eec1f05 100644 --- a/helm/ph-ee-g2p-sandbox-ci/values_resource.yaml +++ b/helm/ph-ee-g2p-sandbox-ci/values.yaml @@ -3,7 +3,7 @@ ph-ee-g2psandbox: LOGGING_LEVEL_ROOT: INFO limits: cpu: "400m" - memory: "512M" + memory: "384M" requests: cpu: "150m" memory: "256M" @@ -44,12 +44,13 @@ ph-ee-g2psandbox: readinessProbe: initialDelaySeconds: 180 ph_ee_connector_ams_mifos: - limits: - memory: "384M" - cpu: "150m" - requests: - memory: "256M" - cpu: "100m" + resources: + limits: + memory: "384M" + cpu: "150m" + requests: + memory: "256M" + cpu: "100m" ph_ee_connector_mojaloop: readinessProbe: initialDelaySeconds: 120 @@ -79,7 +80,7 @@ ph-ee-g2psandbox: cpu: "150m" mockpayment: limits: - memory: "384M" + memory: "512M" cpu: "250m" requests: memory: "256M" @@ -107,8 +108,8 @@ ph-ee-g2psandbox: readinessProbe: initialDelaySeconds: 180 limits: - memory: "384M" - cpu: "150m" + memory: "448M" + cpu: "250m" requests: memory: "256M" cpu: "100m" @@ -129,10 +130,10 @@ ph-ee-g2psandbox: integration_test: limits: cpu: "800m" - memory: "1.2Gi" + memory: "1200M" requests: cpu: "250m" - memory: "256Mi" + memory: "256M" redis: master: resources: diff --git a/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml b/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml index 52731ad3..e8d3cb8b 100644 --- a/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml +++ b/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml @@ -1,5 +1,7 @@ ph-ee-g2psandbox: ph-ee-engine: + post_installation_job: + enabled: true importer_es: enabled: false ph_ee_connector_ams_mifos: @@ -8,22 +10,6 @@ ph-ee-g2psandbox: enabled: false billPay: enabled: false - connector_bulk: - enabled: false - ph-ee-connector: - enabled: false - ph_ee_connector_gsma: - enabled: false - ph_ee_connector_mojaloop: - enabled: false - vouchers: - enabled: false - importer_rdbms: - enabled: false - mockpayment: - enabled: false - post_installation_job: - enabled: false kibana: enabled: false messagegateway: diff --git a/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml b/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml index 12ac6d57..704ee12f 100644 --- a/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml +++ b/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml @@ -1,23 +1,9 @@ ph-ee-g2psandbox: ph-ee-engine: - importer_es: + post_installation_job: enabled: false elasticsearch: enabled: false - volumeClaimTemplate: - storageClassName: standard - ph-ee-connector: - enabled: false - ph_ee_connector_gsma: - enabled: false - ph_ee_connector_mojaloop: - enabled: false - vouchers: - enabled: false - importer_rdbms: - enabled: false - mockpayment: - enabled: false kibana: enabled: false messagegateway: @@ -26,3 +12,11 @@ ph-ee-g2psandbox: enabled: false operations_web: enabled: false + importer_es: + enabled: false + ph_ee_connector_ams_mifos: + enabled: true + ams_local_interop_host: "https://fynams.sandbox.fynarfin.io/" + ams_local_account_host: "https://fynams.sandbox.fynarfin.io/" + ams_local_customer_host: "https://fynams.sandbox.fynarfin.io/" + ams_local_auth_host: "https://fynams.sandbox.fynarfin.io/" diff --git a/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml b/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml deleted file mode 100644 index c25bcbc3..00000000 --- a/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml +++ /dev/null @@ -1,12 +0,0 @@ - ph-ee-g2psandbox: - ph-ee-engine: - elasticsearch: - enabled: false - kibana: - enabled: false - messagegateway: - enabled: false - notifications: - enabled: false - operations_web: - enabled: false From 3d17ca2fa3b93448a6ed012eb85a1e5e8cff9b58 Mon Sep 17 00:00:00 2001 From: Anover000 <140409886+Anover000@users.noreply.github.com> Date: Mon, 8 Jul 2024 20:27:38 +0530 Subject: [PATCH 6/8] Multiple Payee tenants config. (#95) --- helm/g2p-sandbox-fynarfin-SIT/values.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/helm/g2p-sandbox-fynarfin-SIT/values.yaml b/helm/g2p-sandbox-fynarfin-SIT/values.yaml index 381e351e..41847209 100644 --- a/helm/g2p-sandbox-fynarfin-SIT/values.yaml +++ b/helm/g2p-sandbox-fynarfin-SIT/values.yaml @@ -89,14 +89,26 @@ ph-ee-g2psandbox: value: "https://fynams.sandbox.fynarfin.io/" - name: parties_1_domain value: "mojaloop.sandbox.fynarfin.io" + - name: parties_2_domain + value: "mojaloop.sandbox.fynarfin.io" + - name: parties_3_domain + value: "mojaloop.sandbox.fynarfin.io" - name: parties_0_tenantId value: "wakanda" - name: parties_1_tenantId value: "jupiter" + - name: parties_2_tenantId + value: "pluto" + - name: parties_3_tenantId + value: "venus" - name: parties_0_fspId value: "payerfsp" - name: parties_1_fspId value: "payeefsp" + - name: parties_2_fspId + value: "payeefsp2" + - name: parties_3_fspId + value: "payeefsp3" ingress: enabled: true From cf60a3415d04b4e847473133f0f5dedac11dc1a1 Mon Sep 17 00:00:00 2001 From: kaibalya-fynarfin Date: Thu, 11 Jul 2024 13:38:03 +0530 Subject: [PATCH 7/8] moved payee transaction request bpmn out of archive (#92) --- .../feel/{Archive => }/payee-transaction-request-DFSPID.bpmn | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename orchestration/feel/{Archive => }/payee-transaction-request-DFSPID.bpmn (100%) diff --git a/orchestration/feel/Archive/payee-transaction-request-DFSPID.bpmn b/orchestration/feel/payee-transaction-request-DFSPID.bpmn similarity index 100% rename from orchestration/feel/Archive/payee-transaction-request-DFSPID.bpmn rename to orchestration/feel/payee-transaction-request-DFSPID.bpmn From b99b11cd4d336254ec8b04890d62c25687c87fe4 Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:51:14 +0530 Subject: [PATCH 8/8] dummy --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04c8544d..e20cced4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -512,4 +512,5 @@ workflows: # requires: # - install-helm-chart +