Fix env variable interpolation in ci files

trento-project · Aug 21, 2023 · a40ba4c · a40ba4c
1 parent d0bbe51
commit a40ba4c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/pr_env.yaml b/.github/workflows/pr_env.yaml
@@ -103,22 +103,22 @@ jobs:
                     server:
                       ansible_host: ${{ secrets.PR_ENV_MACHINE_IP }}
           options: |
-            --extra-vars "web_postgres_db='${{ env.PR_NUMBER}}db' \
-            web_postgres_event_store='${{ env.PR_NUMBER}}edb' \
-            wanda_postgres_db='${{ env.PR_NUMBER}}wandadb' \
-            web_postgres_user='${{ env.PR_NUMBER}}web' \
-            wanda_postgres_user='${{ env.PR_NUMBER}}wanda' \
-            web_container_name='${{ env.PR_NUMBER}}web' \
-            web_container_image='ghcr.io/trento-project/trento-web:${{ env.PR_NUMBER}}-env' \
+            --extra-vars "web_postgres_db='${{ env.PR_NUMBER }}db' \
+            web_postgres_event_store='${{ env.PR_NUMBER }}edb' \
+            wanda_postgres_db='${{ env.PR_NUMBER }}wandadb' \
+            web_postgres_user='${{ env.PR_NUMBER }}web' \
+            wanda_postgres_user='${{ env.PR_NUMBER }}wanda' \
+            web_container_name='${{ env.PR_NUMBER }}web' \
+            web_container_image='ghcr.io/trento-project/trento-web:${{ env.PR_NUMBER }}-env' \
             wanda_container_image='ghcr.io/trento-project/trento-wanda:demo' \
-            wanda_container_name='${{ env.PR_NUMBER}}wanda' \
-            docker_network_name='${{ env.PR_NUMBER}}net' \
-            nginx_vhost_filename='${{ env.PR_NUMBER}}' \
-            trento_server_name='${{ env.PR_BASE_URL}}' \
+            wanda_container_name='${{ env.PR_NUMBER }}wanda' \
+            docker_network_name='${{ env.PR_NUMBER }}net' \
+            nginx_vhost_filename='${{ env.PR_NUMBER }}' \
+            trento_server_name='${{ env.PR_BASE_URL }}' \
             web_postgres_password='trento' \
             wanda_postgres_password='wanda' \
-            rabbitmq_vhost='${{ env.PR_NUMBER}}' \
-            rabbitmq_username='${{ env.PR_NUMBER}}rabbitusr' \
+            rabbitmq_vhost='${{ env.PR_NUMBER }}' \
+            rabbitmq_username='${{ env.PR_NUMBER }}rabbitusr' \
             rabbitmq_password='trento' \
             prometheus_url='http://localhost' \
             web_admin_password='adminpassword' \
@@ -127,10 +127,10 @@ jobs:
             force_recreate_wanda_container='true' \
             force_recreate_web_container='true' \
             force_pull_images='true' \
-            web_upstream_name='${{ env.PR_NUMBER}}web' \
-            wanda_upstream_name='${{ env.PR_NUMBER}}wanda' \
-            grafana_upstream_name='${{ env.PR_NUMBER}}grafana' \
-            trento_server_url='http://${{ env.PR_BASE_URL}}'"
+            web_upstream_name='${{ env.PR_NUMBER }}web' \
+            wanda_upstream_name='${{ env.PR_NUMBER }}wanda' \
+            grafana_upstream_name='${{ env.PR_NUMBER }}grafana' \
+            trento_server_url='http://${{ env.PR_BASE_URL }}'"
   run-photofinish-demo-env:
     name: Use photofinish to push mock data to the pr environment
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/pr_env_close.yaml b/.github/workflows/pr_env_close.yaml
@@ -92,20 +92,20 @@ jobs:
                     server:
                       ansible_host: ${{ secrets.PR_ENV_MACHINE_IP }}
           options: |
-            --extra-vars "web_postgres_db='${{ env.PR_NUMBER}}db' \
-            web_postgres_event_store='${{ env.PR_NUMBER}}edb' \
-            wanda_postgres_db='${{ env.PR_NUMBER}}wandadb' \
-            web_postgres_user='${{ env.PR_NUMBER}}web' \
-            wanda_postgres_user='${{ env.PR_NUMBER}}wanda' \
-            web_container_name='${{ env.PR_NUMBER}}web' \
-            web_container_image='ghcr.io/trento-project/trento-web:${{ env.PR_NUMBER}}-env' \
-            wanda_container_name='${{ env.PR_NUMBER}}wanda' \
-            docker_network_name='${{ env.PR_NUMBER}}net' \
-            nginx_vhost_filename='${{ env.PR_NUMBER}}' \
-            trento_server_name='${{ env.PR_BASE_URL}}' \
+            --extra-vars "web_postgres_db='${{ env.PR_NUMBER }}db' \
+            web_postgres_event_store='${{ env.PR_NUMBER }}edb' \
+            wanda_postgres_db='${{ env.PR_NUMBER }}wandadb' \
+            web_postgres_user='${{ env.PR_NUMBER }}web' \
+            wanda_postgres_user='${{ env.PR_NUMBER }}wanda' \
+            web_container_name='${{ env.PR_NUMBER }}web' \
+            web_container_image='ghcr.io/trento-project/trento-web:${{ env.PR_NUMBER }}-env' \
+            wanda_container_name='${{ env.PR_NUMBER }}wanda' \
+            docker_network_name='${{ env.PR_NUMBER }}net' \
+            nginx_vhost_filename='${{ env.PR_NUMBER }}' \
+            trento_server_name='${{ env.PR_BASE_URL }}' \
             web_postgres_password='trento' \
             wanda_postgres_password='wanda' \
-            rabbitmq_vhost='${{ env.PR_NUMBER}}' \
+            rabbitmq_vhost='${{ env.PR_NUMBER }}' \
             rabbitmq_password='trento' \
-            rabbitmq_username='${{ env.PR_NUMBER}}rabbitusr' \
+            rabbitmq_username='${{ env.PR_NUMBER }}rabbitusr' \
             remove_wanda_container_image='false'"