Skip to content

Commit

Permalink
test2
Browse files Browse the repository at this point in the history
  • Loading branch information
jbygdell committed Aug 22, 2023
1 parent 088559e commit 1b86eed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/integration/scripts/charts/deploy_charts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ex
if [ "$1" == "sda-db" ]; then
ROOTPASS=$(yq e '.global.db.password' .github/integration/scripts/charts/values.yaml)
helm install postgres charts/sda-db \
--set image.tag=test-postgres \
--set image.tag="PR$2-postgres" \
--set image.pullPolicy=Never \
--set global.postgresAdminPassword="$ROOTPASS" \
--set global.tls.enabled=false \
Expand All @@ -16,7 +16,7 @@ fi
if [ "$1" == "sda-mq" ]; then
ADMINPASS=$(yq e '.global.broker.password' .github/integration/scripts/charts/values.yaml)
helm install broker charts/sda-mq \
--set image.tag=test-rabbitmq \
--set image.tag="PR$2-rabbitmq" \
--set image.pullPolicy=Never \
--set global.adminPassword="$ADMINPASS" \
--set global.adminUser=admin \
Expand All @@ -28,7 +28,7 @@ fi

if [ "$1" == "sda-svc" ]; then
helm install pipeline charts/sda-svc \
--set image.tag=test \
--set image.tag="PR$2" \
--set image.pullPolicy=Never \
-f .github/integration/scripts/charts/values.yaml \
--wait
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_pr_container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,14 @@ jobs:
shell: bash

- name: Deploy DB
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-db
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-db ${{ github.event.number }}

- name: Deploy MQ
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-mq
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-mq ${{ github.event.number }}
shell: bash

- name: Deploy pipeline
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-svc
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-svc ${{ github.event.number }}
shell: bash

- name: test
Expand Down

0 comments on commit 1b86eed

Please sign in to comment.