fixup! wip: basic test for peerpods

edgelesssys · Nov 12, 2024 · e2a7c74 · e2a7c74
1 parent a5b08e3
commit e2a7c74
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/e2e_peerpods.yml b/.github/workflows/e2e_peerpods.yml
@@ -22,13 +22,13 @@ jobs:
           echo "rg=contrastpp$RANDOM" | tee -a "$GITHUB_OUTPUT"
       - name: Test peer-pods
         run: |
-          export azure_resource_group="${{ steps.resourcegroup.outputs.rg }}"
+          export azure_resource_group=contrast-ci
           export azure_location=northeurope
           export azure_subscription_id="0d202bbb-4fa7-4af8-8125-58c269a05435"
           export CONTRAST_CACHE_DIR="./workspace.cache"
-          
+
           nix run .#scripts.test-peerpods
       - name: Terminate cluster
         if: always()
         run: |
-          az group delete --name "${{ steps.resourcegroup.outputs.rg }}_caa_cluster" --yes
+          nix run -L .#terraform -- -chdir=infra/azure-peerpods destroy --auto-approve
diff --git a/infra/azure-peerpods/main.tf b/infra/azure-peerpods/main.tf
@@ -37,7 +37,7 @@ locals {
 }
 
 data "azurerm_resource_group" "rg" {
-  name = local.name
+  name = "${var.resource_group}"
 }
 
 resource "azuread_application" "app" {

diff --git a/infra/azure-peerpods/vars.tf b/infra/azure-peerpods/vars.tf
@@ -2,7 +2,7 @@ variable "name_prefix" {
   type = string
 }
 
-variable "image_resource_group_name" {
+variable "resource_group" {
   type = string
 }
 

diff --git a/packages/test-peerpods.sh b/packages/test-peerpods.sh
@@ -4,7 +4,21 @@
 
 set -euo pipefail
 
-just create AKS-PEER-SNP
+# TODO(burgerdev): this should be possible with `just create AKS-PEER-SNP`
+true || nix run -L .#scripts.upload-image -- \
+  --subscription-id="${azure_subscription_id:?}" \
+  --location="${azure_location:?}" \
+  --resource-group="${azure_resource_group:?}"
+image_id=/subscriptions/0d202bbb-4fa7-4af8-8125-58c269a05435/resourceGroups/contrast-ci/providers/Microsoft.Compute/galleries/contrast_ci_contrast/images/contrast/versions/0.0.1730981348
+echo "image_id = \"${image_id}\"" > infra/azure-peerpods/image_id.auto.tfvars
+
+echo "name_prefix = \"${azure_resource_group:?}\"" > infra/azure-peerpods/just.auto.tfvars
+echo "resource_group = \"${azure_resource_group:?}\"" >> infra/azure-peerpods/just.auto.tfvars
+echo "subscription_id = \"${azure_subscription_id:?}\"" >> infra/azure-peerpods/just.auto.tfvars
+
+nix run -L .#terraform -- -chdir=infra/azure-peerpods init
+nix run -L .#terraform -- -chdir=infra/azure-peerpods apply --auto-approve
+
 just get-credentials AKS-PEER-SNP
 just node-installer AKS-PEER-SNP