Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

ci: Windows VHD pipeline tests #3977

Merged
merged 2 commits into from Oct 28, 2020
Merged

Conversation

jsturtevant
Copy link
Contributor

@jsturtevant jsturtevant commented Oct 27, 2020

Reason for Change:

This PR unblocks the Windows VHD scripts by doing two things:

  • Removes Azure VM agents from the sysprep process
    • this fixes an issue where there was a missing DLL on recent upgrade of the Azure VM agents that caused sysprep to fail: azure-arm: IMAGE_STATE_UNDEPLOYABLE - missing VMAgentDisabler.dll. The VM agent doesn't do anything during sysprep so it is ok to remove it. If the image is deployed to Azure as a VM the agent will redeployed.
  • Fixes the e2e tests during the VHD build using USE_MANAGED_IDENTITY=false

Issue Fixed:

Credit Where Due:

Does this change contain code from or inspired by another project?

  • No
  • Yes

If "Yes," did you notify that project's maintainers and provide attribution?

  • No
  • Yes

Requirements:

Notes:

@acs-bot acs-bot added the size/M label Oct 27, 2020
@jsturtevant jsturtevant changed the title Fix: Windows VHD pipeline tests fix: Windows VHD pipeline tests Oct 27, 2020
@@ -0,0 +1,38 @@
# Stop and remove Azure Agents to enable use in Azure Stack
# If deployed in azure vm the agents will be added to the vms at deployment time
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you plan to stop DiagTrack?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only want to stop DiagTrack in the pause image which is being done in: kubernetes/kubernetes#95950

vhd/packer/sysprep.ps1 Outdated Show resolved Hide resolved
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@@ -0,0 +1,36 @@
# Stop and remove Azure Agents to enable use in Azure Stack
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pulling this out into a separate script!

Copy link
Contributor

@marosset marosset left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/LGTM

@marosset
Copy link
Contributor

@AbelHu @mainred FYI

@jsturtevant jsturtevant changed the title fix: Windows VHD pipeline tests ci: Windows VHD pipeline tests Oct 28, 2020
@acs-bot
Copy link

acs-bot commented Oct 28, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, jsturtevant, marosset

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [jackfrancis,jsturtevant,marosset]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@marosset marosset merged commit 4731016 into Azure:master Oct 28, 2020
penggu pushed a commit to penggu/aks-engine that referenced this pull request Oct 28, 2020
* disabling managed identity for windows vhd build make test-kubernetes step

* Disable Azure Agents and remove from sysprep

Co-authored-by: marosset <marosset@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants