osmodifier: [last follow-up] remove all orphaned osmodifier references

.pipelines/templates/e2e-arm64-template.yml

@@ -37,10 +37,6 @@ parameters:
       - forceBuild
       - prebuilt
 
-  - name: osModifierBranch
-    type: string
-    default: "main"
-
   - name: baseImageArtifactStage
     type: string
     default: ""
@@ -67,7 +63,6 @@ stages:
       tridentArtifactName: trident-binaries
       codeCoverage: false
       tridentBuildOptions: ${{ parameters.tridentBuildOptions }}
-      osModifierBranch: ${{ parameters.osModifierBranch }}
       dependsOnStage: ${{ parameters.baseImageArtifactStage }}
       targetArchitecture: arm64
 

.pipelines/templates/e2e-template.yml

@@ -77,10 +77,6 @@ parameters:
     type: number
     default: 3
 
-  - name: osModifierBranch
-    type: string
-    default: "main"
-
   - name: baremetalTestsEnabled
     type: boolean
     default: true
@@ -109,7 +105,6 @@ stages:
         tridentArtifactName: trident-binaries
         codeCoverage: false
         tridentBuildOptions: ${{ parameters.tridentBuildOptions }}
-        osModifierBranch: ${{ parameters.osModifierBranch }}
         dependsOnStage: ${{ parameters.baseImageArtifactStage }}
         targetArchitecture: amd64
 
@@ -129,7 +124,6 @@ stages:
   - ${{ if eq(parameters.stageType, 'ci') }}:
       - template: stages/validate_makefile/dev-build.yml
         parameters:
-          osModifierBranch: ${{ parameters.osModifierBranch }}
           ${{ if eq(parameters.stageType, 'ci') }}:
             # Run CodeQL for this in CI only
             runCodeql: true
@@ -370,7 +364,6 @@ stages:
       - template: stages/testing_functional/functional-testing.yml
         parameters:
           downloadPrebuiltImage: false
-          osModifierBranch: ${{ parameters.osModifierBranch }}
           dependsOnStage: ${{ parameters.baseImageArtifactStage }}
 
       # VM Testing (host, post_merge)

.pipelines/templates/stages/testing_functional/functional-testing.yml

@@ -18,10 +18,6 @@ parameters:
     default: 5067 # [GITHUB]-trident-ci
     displayName: Where to download prebuilt image from
 
-  - name: osModifierBranch
-    type: string
-    default: "main"
-
   - name: dependsOnStage
     type: string
     default: ""

.pipelines/templates/stages/trident_rpms/build-source.yml

@@ -6,10 +6,6 @@ parameters:
     type: boolean
     default: true
 
-  - name: osModifierBranch
-    type: string
-    default: "main"
-
   - name: dependsOnStage
     type: string
     default: ""
@@ -20,14 +16,6 @@ parameters:
       - amd64
       - arm64
 
-  - name: osModifierBuildType
-    displayName: OSModifier build type to download from osmodifier pipelines
-    type: string
-    values:
-      - dev
-      - preview
-    default: preview
-
   - name: runCodeql
     type: boolean
     default: false

.pipelines/templates/stages/trident_rpms/trident-stage.yml

@@ -32,10 +32,6 @@ parameters:
       - forceBuild
       - prebuilt
 
-  - name: osModifierBranch
-    type: string
-    default: "main"
-
   - name: dependsOnStage
     type: string
     default: ""
@@ -56,14 +52,8 @@ stages:
         parameters:
           tridentArtifactName: ${{ parameters.tridentArtifactName }}
           codeCoverage: ${{ parameters.codeCoverage }}
-          osModifierBranch: ${{ parameters.osModifierBranch }}
           dependsOnStage: ${{ parameters.dependsOnStage }}
           targetArchitecture: ${{ parameters.targetArchitecture }}
-          # trident-cicd-for-prism should run against the latest main build of osmodifier.
-          ${{ if eq(parameters.stageType, 'ci') }}:
-            osModifierBuildType: dev
-          ${{ else }}:
-            osModifierBuildType: preview
           ${{ if eq(parameters.stageType, 'ci') }}:
             # Run CodeQL for this in CI only
             runCodeql: true

.pipelines/templates/stages/validate_makefile/dev-build.yml

@@ -1,8 +1,4 @@
 parameters:
-  - name: osModifierBranch
-    type: string
-    default: "main"
-
   - name: dependsOnStage
     type: string
     default: ""

.pipelines/templates/trident-platform-cicd-for-prism-template.yml

@@ -18,11 +18,6 @@ parameters:
     type: string
     default: "*.*.*"
 
-  - name: osModifierBranch
-    displayName: OSModifier branch to build from (if not main)
-    type: string
-    default: "main"
-
 stages:
     - template: stages/base_image_config/create-base-image-config-artifact.yml
     - template: e2e-template.yml
@@ -32,13 +27,11 @@ stages:
         tridentBuildOptions: forceBuild
         micBuildType: ${{ parameters.micBuildType }}
         micVersion: ${{ parameters.micVersion }}
-        osModifierBranch: ${{ parameters.osModifierBranch }}
         baseImageArtifactStage: CreateBaseImageConfig
     - template: e2e-arm64-template.yml
       parameters:
         stageType: ci
         tridentBuildOptions: forceBuild
-        osModifierBranch: ${{ parameters.osModifierBranch }}
         baseImageArtifactStage: CreateBaseImageConfig
         micBuildType: ${{ parameters.micBuildType }}
         micVersion: ${{ parameters.micVersion }}

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

@@ -13,11 +13,6 @@ parameters:
     type: string
     default: "*.*.*"
 
-  - name: osModifierBranch
-    displayName: OSModifier branch to use for dev build type
-    type: string
-    default: "main"
-
 schedules:
   - cron: "0 9 * * *" # avoid trident-prerelease time
     displayName: Daily build
@@ -57,4 +52,3 @@ extends:
         parameters:
           micBuildType: ${{ parameters.micBuildType }}
           micVersion: ${{ parameters.micVersion }}
-          osModifierBranch: ${{ parameters.osModifierBranch }}

crates/trident_api/src/error.rs

@@ -30,10 +30,6 @@ pub enum ExecutionEnvironmentMisconfigurationError {
     #[error("Failed to run due to missing root privileges")]
     CheckRootPrivileges,
 
-    #[error("Failed to find OS Modifier binary at '{binary_path}' required by '{config}'")]
-    #[serde(rename = "find-os-modifier-binary")]
-    FindOSModifierBinary { binary_path: String, config: String },
-
     #[error("Failed to find required binary '{binary}'")]
     MissingBinary { binary: &'static str },
 

docs/Development/Building/Building.md

@@ -38,52 +38,6 @@ make build
 
 The binary will be placed at `target/release/trident`.
 
-## Building OS Modifier
-
-Trident depends on `osmodifier`, a tool coming from the
-[Azure Linux Image Tools](https://github.com/microsoft/azure-linux-image-tools)
-repository, to perform OS image modifications.
-
-To build `osmodifier` locally, run:
-
-```bash
-# Clone the Azure Linux Image Tools repository 
-git clone https://github.com/microsoft/azure-linux-image-tools.git
-
-# Run the osmodifier make target
-make -C ./azure-linux-image-tools/toolkit go-osmodifier
-
-# Copy the built binary to the artifacts directory
-cp ./azure-linux-image-tools/toolkit/out/tools/osmodifier artifacts/osmodifier
-
-# Clean up
-rm -rf ./azure-linux-image-tools
-```
-
-Alternatively, you can build `osmodifier` on Azure Linux 3 using Docker:
-
-```bash
-# Clone the Azure Linux Image Tools repository 
-git clone https://github.com/microsoft/azure-linux-image-tools.git
-
-# Build osmodifier inside an Azure Linux 3 container
-docker build -t trident/osmodifier-build:latest \
-    -f packaging/docker/Dockerfile-osmodifier.azl3 \
-    .
-mkdir -p artifacts
-ID=$(docker create trident/osmodifier-build:latest)
-docker cp -q $ID:/work/azure-linux-image-tools/toolkit/out/tools/osmodifier artifacts/osmodifier
-docker rm -v $ID
-```
-
-:::info
-
-`osmodifier` is a portable Golang binary, so you can build it on any Linux
-distribution and use it on Azure Linux 3, but it is still recommended to build it
-on the same OS to avoid any potential compatibility issues.
-
-:::
-
 ## Building RPMs for Azure Linux
 
 ```bash

docs/Development/Building/Dependencies.md

@@ -11,7 +11,7 @@ Trident's dependencies.
 ### Compilers
 
 - Rust: latest stable
-- Go: 1.25+ (for osmodifier)
+- Go: 1.25+
 
 ### Packages
 

docs/Development/Testing/E2E-Tests.md

@@ -94,12 +94,6 @@ make bin/isopatch        # Injects files into ISOs
 make bin/rcp-agent       # Remote control plane agent
 ```
 
-### 3. Build osmodifier
-
-```bash
-make artifacts/osmodifier
-```
-
 ### 4. Build Trident RPMs
 
 The test images include Trident packages built from your local tree. This step
@@ -111,7 +105,7 @@ make bin/trident-rpms.tar.gz
 ```
 
 This requires Docker and uses the Trident packaging Dockerfile to produce
-RPMs from your compiled binary and osmodifier.
+RPMs from your compiled binary.
 
 ### 5. Generate SSH Keys
 

docs/Development/Testing/Functional-Tests.md

@@ -69,9 +69,6 @@ can build them individually if needed:
 # Build virtdeploy (VM management tool)
 make bin/virtdeploy
 
-# Build osmodifier
-make artifacts/osmodifier
-
 # Build the functional test binaries with code coverage instrumentation
 make build-functional-test-cc