From 3d62acbb541d0b3c4fccda940cc019693ff685d4 Mon Sep 17 00:00:00 2001 From: Carsten Schafer <49571202+carsten989@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:35:52 -0400 Subject: [PATCH] Handle locations inside deploy repo (#966) Co-authored-by: Carsten Schafer --- .github/workflows/ucentralgw-demo-deployment.yaml | 2 +- .github/workflows/ucentralgw-dev-deployment.yaml | 2 +- .github/workflows/ucentralgw-qa-deployment.yaml | 2 +- .github/workflows/ucentralgw-qa2-deployment.yaml | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ucentralgw-demo-deployment.yaml b/.github/workflows/ucentralgw-demo-deployment.yaml index 6cec969605..7553d304be 100644 --- a/.github/workflows/ucentralgw-demo-deployment.yaml +++ b/.github/workflows/ucentralgw-demo-deployment.yaml @@ -118,7 +118,6 @@ jobs: working-directory: wlan-cloud-ucentral-deploy/chart/environment-values run: | export NAMESPACE=${{ matrix.namespace }} - export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }} @@ -130,6 +129,7 @@ jobs: export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }} export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }} export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }} + export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml if [[ "${{ github.event.inputs.force_latest }}" == "false" ]]; then export DEPLOY_METHOD=${{ matrix.deploy_method }} export CHART_VERSION=${{ matrix.chart_version }} diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index fe68f664bb..bc356de62a 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -118,7 +118,6 @@ jobs: working-directory: wlan-cloud-ucentral-deploy/chart/environment-values run: | export NAMESPACE=${{ matrix.namespace }} - export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }} @@ -130,6 +129,7 @@ jobs: export MAILER_USERNAME=${{ secrets.MAILER_USERNAME }} export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }} export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }} + export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml if [[ "${{ github.event.inputs.force_latest }}" == "false" ]]; then export DEPLOY_METHOD=${{ matrix.deploy_method }} export CHART_VERSION=${{ matrix.chart_version }} diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 4d887c24b4..7835264caf 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -110,7 +110,7 @@ jobs: export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }} export OWSUB_VERSION=${{ matrix.owsub_version }} export OWRRM_VERSION=${{ matrix.owrrm_version }} - export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml + export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }} diff --git a/.github/workflows/ucentralgw-qa2-deployment.yaml b/.github/workflows/ucentralgw-qa2-deployment.yaml index 829402d443..4912d1ccf4 100644 --- a/.github/workflows/ucentralgw-qa2-deployment.yaml +++ b/.github/workflows/ucentralgw-qa2-deployment.yaml @@ -110,7 +110,7 @@ jobs: export OWANALYTICS_VERSION=${{ matrix.owanalytics_version }} export OWSUB_VERSION=${{ matrix.owsub_version }} export OWRRM_VERSION=${{ matrix.owrrm_version }} - export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml + export VALUES_FILE_LOCATION=values.openwifi-qa.yaml,values.openwifi-qa.single-external-db.yaml,values.openwifi-qa.separate-lbs.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} export OWGW_AUTH_PASSWORD=${{ secrets.UCENTRALGW_AUTH_PASSWORD }} @@ -123,7 +123,6 @@ jobs: export MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }} export IPTOCOUNTRY_IPINFO_TOKEN=${{ secrets.IPTOCOUNTRY_IPINFO_TOKEN }} export EXTRA_VALUES='owgw.configProperties.logging\.level=information' - echo "key=${AWS_SECRET_ACCESS_KEY}" | base64 ./deploy.sh - name: Show resource state on deployment failure