Update/december23

.github/workflows/ubuntu-win-generation.yml

@@ -65,10 +65,10 @@ jobs:
         run: |
           $ImageType = "${{ inputs.image_name }}"
 
-          if ($ImageType.StartsWith("ubuntu")) { $TemplateDirectoryName = "linux" } else { $TemplateDirectoryName = "win" }
+          if ($ImageType.StartsWith("ubuntu")) { $TemplateDirectoryName = "ubuntu" } else { $TemplateDirectoryName = "win" }
 
           $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path
-          $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl"
+          $TemplatePath = Join-Path $TemplateDirectoryPath "templates/$ImageType.pkr.hcl"
 
           if ( -not (Test-Path $TemplatePath) ) {
             $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json"

.github/workflows/ubuntu2204.yml

@@ -14,6 +14,7 @@ on:
     types: labeled
     paths:
     - 'images/linux/**'
+    - 'images/ubuntu/**'
 #  schedule:
 #    - cron: '0 0 * * *'
 
@@ -22,7 +23,7 @@ jobs:
     if: ${{ (github.event.label.name == 'CI:\ ubuntu-all') || (github.event.label.name == 'CI:\ ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }}
     uses: ./.github/workflows/ubuntu-win-generation.yml
     with:
-      image_name: 'ubuntu2204'
+      image_name: 'ubuntu-22.04'
       image_readme_name: 'Ubuntu2204-Readme.md'
       custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }}
       custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }}

images.CI/linux-and-win/build-image.ps1

@@ -38,21 +38,22 @@ $SensitiveData = @(
 Write-Host "Show Packer Version"
 packer --version
 
+packer init $TemplatePath
+
 Write-Host "Build $Image VM"
 packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `
                 -var "client_id=$ClientId" `
                 -var "client_secret=$ClientSecret" `
                 -var "install_password=$InstallPassword" `
                 -var "location=$Location" `
-                -var "resource_group=$ResourceGroup" `
+                -var "resource_group_name=$ResourceGroup" `
                 -var "storage_account=$StorageAccount" `
                 -var "subscription_id=$SubscriptionId" `
                 -var "temp_resource_group_name=$TempResourceGroupName" `
                 -var "tenant_id=$TenantId" `
                 -var "virtual_network_name=$VirtualNetworkName" `
                 -var "virtual_network_resource_group_name=$VirtualNetworkRG" `
                 -var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
-                -var "run_validation_diskspace=$env:RUN_VALIDATION_FLAG" `
                 -var "private_virtual_network_with_public_ip=true" `
                 -color=false `
                 $TemplatePath `