engineering: migrate image build definitions from test-images to trident

.pipelines/pipeline-tester.yml

@@ -62,11 +62,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

.pipelines/templates/e2e-template.yml

@@ -241,8 +241,9 @@ stages:
             # Run CodeQL for this in CI only
             runCodeql: true
 
-  # dom0 is failing for not known reasons ... comment out for now to unblock, longterm this may
-  # be removed from Trident pipelines alltogether in favor of being only test-images
+  # dom0 is failing for not known reasons ... comment out for now to unblock.
+  # If this stage is re-enabled later, update the disabled template first to finish
+  # the migration away from the old test-images repository references.
   # - ${{ if or(eq(parameters.stageType, 'ci'), eq(parameters.stageType, 'pr-e2e')) }}:
   #   # Build Trident test image (dom0: mshv+ch)
   #   - template: stages/build_image/trident-mshvch-dom0-testimg.yml

.pipelines/templates/stages/build_image/build-image-template.yml

@@ -1,4 +1,3 @@
-# TODO: Migrate test images to Trident repository and build them locally #16117
 parameters:
   - name: tridentSourceDirectory
     type: string
@@ -69,7 +68,9 @@ steps:
       set -eux
 
       if which tdnf; then
-        sudo tdnf install -y veritysetup
+        # nss-tools provides certutil while pesign provides efikeygen & pesign,
+        # which are required for producing a signed image to enable SecureBoot
+        sudo tdnf install -y veritysetup nss-tools pesign
         sudo systemctl start docker
       else
         # Ubuntu is used for building and testing of VM images suitable for
@@ -140,8 +141,8 @@ steps:
 
       # Move Trident RPMs to bin/RPMS/ (builder expects bin/RPMS/*.rpm)
       if [ -d "$(Build.ArtifactStagingDirectory)/trident" ]; then
-        mkdir -p bin/RPMS/x86_64
-        mv "$(Build.ArtifactStagingDirectory)/trident"/*.rpm bin/RPMS/x86_64/
+        mkdir -p bin/RPMS
+        find "$(Build.ArtifactStagingDirectory)/trident" -name '*.rpm' -exec mv {} bin/RPMS/ \;
         rm -rf "$(Build.ArtifactStagingDirectory)/trident"
       fi
     displayName: "Prepare and move requirements"

.pipelines/templates/stages/build_image/build-image.yml

@@ -77,13 +77,14 @@ stages:
             parameters:
               tridentSourceDirectory: $(TRIDENT_SOURCE_DIR)
 
-          - template: .pipelines/templates/build-image.yml@test-images
+          - template: ../build_image/build-image-template.yml
             parameters:
+              tridentSourceDirectory: $(TRIDENT_SOURCE_DIR)
               imageName: ${{ parameters.imageName }}
-              clones: ${{ parameters.clones }}
               baseimgBuildType: $(BASEIMG_BUILD_TYPE)
               baseimgVersion: $(BASEIMG_VERSION)
               rpmsVersion: $(RPMS_VERSION)
               azureLinuxVersion: ${{ variables.BASEIMG_AZURE_LINUX_VERSION }}
               micBuildType: ${{ parameters.micBuildType }}
               micVersion: ${{ parameters.micVersion }}
+              clones: ${{ parameters.clones }}

.pipelines/testing-trident.yml

@@ -79,11 +79,6 @@ variables:
 
 resources:
   repositories:
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-tests
       type: git
       name: platform-tests

.pipelines/trident-ci.yml

@@ -25,28 +25,6 @@ resources:
       type: git
       name: platform-tests
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-      trigger:
-        batch: true
-        branches:
-          include:
-            - main
-        paths:
-          include:
-            - Makefile
-            - testimages.py
-            - builder/**
-            - platform-integration-images/**
-            - .pipelines/**/*trident*
-          exclude:
-            - platform-integration-images/mshvch-testimage/**
-            - platform-integration-images/k8s-testimage/**
-            - platform-integration-images/qemu-guest-testimage/**
-            - platform-integration-images/remote-qemu-guest-k8s-testimage/**
-
     - repository: platform-pipelines
       type: git
       name: platform-pipelines

.pipelines/trident-cicd-for-prism.yml

@@ -40,11 +40,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

.pipelines/trident-cicd.yml

@@ -40,11 +40,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

.pipelines/trident-full-validation.yml

@@ -41,11 +41,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

.pipelines/trident-pr-e2e-azure.yml

@@ -26,11 +26,6 @@ resources:
       type: git
       name: platform-tests
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-pipelines
       type: git
       name: platform-pipelines

.pipelines/trident-pr-e2e.yml

@@ -16,11 +16,6 @@ resources:
       type: git
       name: platform-tests
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-pipelines
       type: git
       name: platform-pipelines

.pipelines/trident-prerelease.yml

@@ -43,11 +43,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

.pipelines/trident-scale-official.yml

@@ -96,11 +96,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

.pipelines/trident-scale.yml

@@ -71,11 +71,6 @@ resources:
       name: platform-pipelines
       ref: refs/heads/main
 
-    - repository: test-images
-      type: git
-      name: test-images
-      ref: refs/heads/main
-
     - repository: platform-telemetry
       name: platform-telemetry
       type: git

tests/images/builder/builder.py

@@ -443,7 +443,6 @@ def build_signed_image(
     sign.sign_boot_artifacts(
         ca_nss_key_db,
         leaf_key_name,
-        image.get_items_to_sign(),
         inject_files_yaml_path,
         output_artifacts_dir,
     )