debug

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
edgelesssys · Dec 13, 2024 · 04b2583 · 04b2583
1 parent 0ae2786
commit 04b2583
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 25 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -44,25 +44,21 @@ jobs:
         uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.UPLOSI_AZURE_E2E_CREDENTIALS }}
-      - name: Create resource group override
-        id: rg
+      - name: Create base name override
+        id: name
         env:
           variant: ${{ matrix.variant }}
         run: |
           uuid=$(cat /proc/sys/kernel/random/uuid)
           uuid=${uuid:0:8}
 
-          resource_group="uplosi_e2e_${variant}_${uuid}"
-          echo "resource_group=${resource_group}" | tee -a "$GITHUB_OUTPUT"
+          base_name="uplosi_e2e_${variant}_${uuid}"
+          echo "base_name=${base_name}" | tee -a "$GITHUB_OUTPUT"
 
           mkdir -p ./testdata/uplosi.conf.d
           cat <<EOF > ./testdata/uplosi.conf.d/0100-azure.conf
-          [variant.${variant}]
-          provider = "azure"
-          [variant.${variant}.azure]
-          resourceGroup = "${resource_group}"
-          sharedImageGallery = "${resource_group}"
-          sharingProfile = "private"
+          [base]
+          name = "${base_name}"
           EOF
           cat ./testdata/uplosi.conf.d/0100-azure.conf
       - name: Build minimal image
@@ -79,6 +75,6 @@ jobs:
       - name: Delete resource group
         if: always()
         env:
-          rg: ${{ steps.rg.outputs.resource_group }}
+          rg: ${{ steps.name.outputs.base_name }}
         run: |
           az group delete --name "${rg}" --yes
diff --git a/testdata/uplosi.conf b/testdata/uplosi.conf
@@ -1,22 +1,22 @@
 [base]
 imageVersion = "1.2.3"
-name = "uplosi_test"
+# name = "uplosi_test"
 
 [base.azure]
 subscriptionID = "0d202bbb-4fa7-4af8-8125-58c269a05435"
 location = "GermanyWestCentral"
 
-# [variant.azure_private]
-# provider = "azure"
-# [variant.azure_private.azure]
-# resourceGroup = "{{.Name}}"
-# sharedImageGallery = "{{.Name}}"
-# sharingProfile = "private"
+[variant.azure_private]
+provider = "azure"
+[variant.azure_private.azure]
+resourceGroup = "{{.Name}}"
+sharedImageGallery = "{{.Name}}"
+sharingProfile = "private"
 
-# [variant.azure_public]
-# provider = "azure"
-# [variant.azure_public.azure]
-# resourceGroup = "{{.Name}}"
-# sharedImageGallery = "{{.Name}}"
-# sharingProfile = "community"
-# sharingNamePrefix = "uplositest"
+[variant.azure_public]
+provider = "azure"
+[variant.azure_public.azure]
+resourceGroup = "{{.Name}}"
+sharedImageGallery = "{{.Name}}"
+sharingProfile = "community"
+sharingNamePrefix = "uplositest"