backport: ci: handle npm image not built in ACN Official Build for Singularity Runners trigger (#4249)

* ci: handle npm image not built in ACN Official Build for Singularity Runners trigger

* remove test changes

Author: sharifnasser

.pipelines/multitenancy/swiftv2-manifold-e2e.stages.yaml

@@ -0,0 +1,49 @@
+parameters:
+  - name: name
+    type: string
+  - name: dependsOn
+    type: string
+
+stages:
+  - stage: manifold_e2e
+    displayName: E2E-AKS Swiftv2 Manifold
+    variables:
+      - name: IMAGE_REPO_PATH
+        value: $[ format('{0}/', stageDependencies.setup.env.outputs['EnvironmentalVariables.imageRepositoryPath']) ]
+      - name: NPM_VERSION
+        value: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ]
+      # Azure Container Networking PR Pipeline
+      - ${{ if eq(parameters.dependsOn, 'publish') }}:
+        # Use azure-npm, azure-cni, and azure-cns images
+        - name: IMAGE_REPO_PATH_REF
+          value: 'azure-'
+        - name: CNS_VERSION
+          value: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
+      # ACN Official Build Pipeline
+      - ${{ if ne(parameters.dependsOn, 'publish') }}:
+        # Use /official/npm, /official/cni and /official/cns images
+        - name: IMAGE_REPO_PATH_REF
+          value: $(IMAGE_REPO_PATH) 
+        - name: CNS_VERSION
+          value: $[ stageDependencies.setup.env.outputs['EnvironmentalVariables.cnsVersion'] ]
+    dependsOn:
+      - ${{ parameters.dependsOn }}
+      - setup
+    jobs:
+      - job: ${{ parameters.name }}
+        displayName: AKS Swiftv2 Multitenancy Manifold E2E Test Suite - (${{ parameters.name }})
+        timeoutInMinutes: 240
+        pool:
+          name: $(BUILD_POOL_NAME_DEFAULT)
+          isCustom: true
+          type: linux
+        steps:
+          - task: TriggerBuild@3
+            inputs:
+              buildDefinition: '391699'
+              templateParameters: 'regions: ["westus2"], useAcnPublic: true, cnscniversion: $(CNS_VERSION), cnscniversionwindows: $(CNS_VERSION), cnscniImagePrefix: $(IMAGE_REPO_PATH_REF), npmversion: $(NPM_VERSION)'
+              useSameBranch: false
+              queueBuildForUserThatTriggeredBuild: true
+              branchToUse: 'refs/heads/master'
+              waitForQueuedBuildsToFinish: true
+              authenticationMethod: 'OAuth Token'      

.pipelines/pipeline.yaml

@@ -403,6 +403,13 @@ stages:
         dependsOn: "containerize"
         scaleup: 50
 
+    - ${{ if eq(variables['Build.Reason'], 'Schedule') }}:
+      # AKS Swiftv2 Manifold E2E tests
+      - template: multitenancy/swiftv2-manifold-e2e.stages.yaml
+        parameters:
+          name: "swiftv2_manifold_e2e"
+          dependsOn: publish
+
     - stage: delete
       displayName: Delete Clusters
       condition: always()

.pipelines/run-pipeline.yaml

@@ -116,13 +116,12 @@ stages:
               archiveName: azure-cns
               archiveVersion: $(CNS_VERSION)
               imageTag: $(Build.BuildNumber)
-            # We do not build NPM for Windows 1.6+
-            # npm:
-            #   name: npm
-            #   extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
-            #   archiveName: azure-npm
-            #   archiveVersion: $(NPM_VERSION)
-            #   imageTag: $(Build.BuildNumber)
+            npm:
+              name: npm
+              extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
+              archiveName: azure-npm
+              archiveVersion: $(NPM_VERSION)
+              imageTag: $(Build.BuildNumber)
 
       - job: linux_arm64
         displayName: "Linux/ARM64"
@@ -256,8 +255,8 @@ stages:
               imageReference: $(NPM_LINUX_AMD64_REF)
             - platform: linux/arm64
               imageReference: $(NPM_LINUX_ARM64_REF)
-            # - platform: windows/amd64
-            #   imageReference: $(NPM_WINDOWS_AMD64_REF)
+            - platform: windows/amd64
+              imageReference: $(NPM_WINDOWS_AMD64_REF)
 
 
   # Cilium Podsubnet E2E tests
@@ -426,7 +425,12 @@ stages:
       vmSize: Standard_B2ms
       dependsOn: manifests
       scaleup: 50
-
+  
+  # AKS Swiftv2 Manifold E2E tests
+  - template: multitenancy/swiftv2-manifold-e2e.stages.yaml
+    parameters:
+      name: "swiftv2_manifold_e2e"
+      dependsOn: manifests
 
   - stage: delete
     displayName: Delete Clusters