From 2459d3023442573afff2ed27105dee8063c6faf3 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Fri, 2 Aug 2024 09:12:07 -0400 Subject: [PATCH 1/7] add devops test --- .../artifacts/tests/devops.tests.ps1 | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 b/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 index e69de29bb2..ae764c98a3 100644 --- a/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 +++ b/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 @@ -0,0 +1,48 @@ + +BeforeDiscovery { + + $k3sArcDataClusterName = $env:k3sArcDataClusterName + $k3sArcClusterName = $env:k3sArcClusterName + + $clusters = @($k3sArcDataClusterName, $k3sArcClusterName) + $VMs = @($k3sArcDataClusterName, $k3sArcClusterName) + + $null = Connect-AzAccount -Identity -Tenant $env:tenantId -Subscription $env:subscriptionId + az config set extension.use_dynamic_install=yes_without_prompt +} + +Describe "" -ForEach $clusters { + BeforeAll { + $cluster = $_ + } + It "Cluster exists" { + $clusterObject = Get-AzConnectedKubernetes -ClusterName $cluster -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId + $clusterObject | Should -Not -BeNullOrEmpty + } + It "Azure Arc Connected cluster is connected" { + $connectedCluster = Get-AzConnectedKubernetes -Name $cluster -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId + $connectedCluster.ConnectivityStatus | Should -Be "Connected" + } +} + +Describe "" -ForEach $VMs { + BeforeAll { + $vm = $_ + } + It "VM exists" { + $vmobject = Get-VM -Name $vm + $vmobject | Should -Not -BeNullOrEmpty + } + It "VM is running" { + $vmobject = Get-VM -Name $vm + $vmobject.State | Should -Be "Running" + } + It "Azure Arc Connected Machine exists" { + $connectedMachine = Get-AzConnectedMachine -Name $vm -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId + $connectedMachine | Should -Not -BeNullOrEmpty + } + It "Azure Arc Connected Machine is connected" { + $connectedMachine = Get-AzConnectedMachine -Name $vm -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId + $connectedMachine.Status | Should -Be "Connected" + } +} \ No newline at end of file From 3711e7c1876cd3058dc5712872f197498e0cee80 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Fri, 2 Aug 2024 13:06:04 -0400 Subject: [PATCH 2/7] add config for azcopy --- azure_jumpstart_arcbox/artifacts/installK3s.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_arcbox/artifacts/installK3s.sh b/azure_jumpstart_arcbox/artifacts/installK3s.sh index fe3420a55c..acba6490b8 100644 --- a/azure_jumpstart_arcbox/artifacts/installK3s.sh +++ b/azure_jumpstart_arcbox/artifacts/installK3s.sh @@ -198,4 +198,4 @@ echo "" echo "Uploading the script logs to staging storage" echo "" log="/home/$adminUsername/jumpstart_logs/installK3s.log" -azcopy cp $log "https://$stagingStorageAccountName.blob.core.windows.net/$storageContainerName/installK3s-$vmName.log" \ No newline at end of file +azcopy cp $log "https://$stagingStorageAccountName.blob.core.windows.net/$storageContainerName/installK3s-$vmName.log" --check-length=false \ No newline at end of file From a95cd93523b6c77e369f055b28960e7665d3c387 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Sat, 3 Aug 2024 01:40:24 -0400 Subject: [PATCH 3/7] add pester for devops --- azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 | 4 ++++ azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 index be92a3ed0a..38537438e6 100644 --- a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 @@ -514,6 +514,10 @@ if ($null -ne (Get-ScheduledTask -TaskName "DevOpsLogonScript" -ErrorAction Sile Start-Sleep -Seconds 5 +Write-Header "Running tests to verify infrastructure" + +& "$Env:ArcBoxTestsDir\Invoke-Test.ps1" + Write-Header "Creating deployment logs bundle" $RandomString = -join ((48..57) + (97..122) | Get-Random -Count 6 | % {[char]$_}) diff --git a/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 b/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 index ae764c98a3..c703fac549 100644 --- a/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 +++ b/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 @@ -29,14 +29,6 @@ Describe "" -ForEach $VMs { BeforeAll { $vm = $_ } - It "VM exists" { - $vmobject = Get-VM -Name $vm - $vmobject | Should -Not -BeNullOrEmpty - } - It "VM is running" { - $vmobject = Get-VM -Name $vm - $vmobject.State | Should -Be "Running" - } It "Azure Arc Connected Machine exists" { $connectedMachine = Get-AzConnectedMachine -Name $vm -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId $connectedMachine | Should -Not -BeNullOrEmpty From ab7c17bac0e905427f741f79c7acd38ec9fa5b44 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Sat, 3 Aug 2024 12:34:53 -0400 Subject: [PATCH 4/7] fix pester test dir --- azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 index 38537438e6..531473d363 100644 --- a/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DevOpsLogonScript.ps1 @@ -4,6 +4,7 @@ $Env:ArcBoxDir = "C:\ArcBox" $Env:ArcBoxLogsDir = "C:\ArcBox\Logs" $Env:ArcBoxKVDir = "C:\ArcBox\KeyVault" $Env:ArcBoxIconDir = "C:\ArcBox\Icons" +$Env:ArcBoxTestsDir = "$Env:ArcBoxDir\Tests" $namingPrefix = ($Env:namingPrefix).toLower() $osmReleaseVersion = "1.1.1-1" From 43cff908d73a5b600d718b3be1618e287e453f17 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Sat, 3 Aug 2024 15:08:12 -0400 Subject: [PATCH 5/7] remove vm test --- .../artifacts/tests/devops.tests.ps1 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 b/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 index c703fac549..01666fb69f 100644 --- a/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 +++ b/azure_jumpstart_arcbox/artifacts/tests/devops.tests.ps1 @@ -23,18 +23,4 @@ Describe "" -ForEach $clusters { $connectedCluster = Get-AzConnectedKubernetes -Name $cluster -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId $connectedCluster.ConnectivityStatus | Should -Be "Connected" } -} - -Describe "" -ForEach $VMs { - BeforeAll { - $vm = $_ - } - It "Azure Arc Connected Machine exists" { - $connectedMachine = Get-AzConnectedMachine -Name $vm -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId - $connectedMachine | Should -Not -BeNullOrEmpty - } - It "Azure Arc Connected Machine is connected" { - $connectedMachine = Get-AzConnectedMachine -Name $vm -ResourceGroupName $env:resourceGroup -SubscriptionId $env:subscriptionId - $connectedMachine.Status | Should -Be "Connected" - } } \ No newline at end of file From 7b811b8da86a49ded55f16846494810b09738758 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Sat, 3 Aug 2024 17:59:51 -0400 Subject: [PATCH 6/7] remove line --- azure_jumpstart_arcbox/artifacts/installK3s.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_arcbox/artifacts/installK3s.sh b/azure_jumpstart_arcbox/artifacts/installK3s.sh index 89ca4432a9..bd07e3973f 100644 --- a/azure_jumpstart_arcbox/artifacts/installK3s.sh +++ b/azure_jumpstart_arcbox/artifacts/installK3s.sh @@ -201,4 +201,4 @@ echo "" log="/home/$adminUsername/jumpstart_logs/installK3s.log" storageContainerNameLower=$(echo $storageContainerName | tr '[:upper:]' '[:lower:]') -azcopy cp $log "https://$stagingStorageAccountName.blob.core.windows.net/$storageContainerNameLower/installK3s-$vmName.log" +azcopy cp $log "https://$stagingStorageAccountName.blob.core.windows.net/$storageContainerNameLower/installK3s-$vmName.log" \ No newline at end of file From 89af59a3a2ad4db24b8c4b514a4314c5e6a2bd56 Mon Sep 17 00:00:00 2001 From: Zaid Mohammad Date: Sat, 3 Aug 2024 18:29:35 -0400 Subject: [PATCH 7/7] remove space --- azure_jumpstart_arcbox/artifacts/installK3s.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/azure_jumpstart_arcbox/artifacts/installK3s.sh b/azure_jumpstart_arcbox/artifacts/installK3s.sh index bd07e3973f..df38800f35 100644 --- a/azure_jumpstart_arcbox/artifacts/installK3s.sh +++ b/azure_jumpstart_arcbox/artifacts/installK3s.sh @@ -199,6 +199,5 @@ echo "Uploading the script logs to staging storage" echo "" # Authorize azcopy by using a system-wide managed identity log="/home/$adminUsername/jumpstart_logs/installK3s.log" - storageContainerNameLower=$(echo $storageContainerName | tr '[:upper:]' '[:lower:]') azcopy cp $log "https://$stagingStorageAccountName.blob.core.windows.net/$storageContainerNameLower/installK3s-$vmName.log" \ No newline at end of file