Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing custom image test run (#3147) #3177

Merged
merged 1 commit into from
Aug 13, 2024
Merged

fixing custom image test run (#3147) #3177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests_e2e/orchestrator/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN \
cd $HOME && \
git clone https://github.com/microsoft/lisa.git && \
cd lisa && \
git checkout 95c09ff7d5b6e71d1642a628607ac9bb441c69f5 && \
git checkout 0e37ed07304b74362cfb3d3c55ac932d3bdc660c && \
\
python3 -m pip install --upgrade pip && \
python3 -m pip install --editable .[azure,libvirt] --config-settings editable_mode=compat && \
Expand Down
2 changes: 1 addition & 1 deletion tests_e2e/test_suites/agent_wait_for_cloud_init.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This test verifies that the Agent waits for cloud-init to complete before it starts processing extensions.
#
# NOTE: This test is not fully automated. It requires a custom image where the test Agent has been installed and Extensions.WaitForCloudInit is enabled in waagent.conf.
# To execute it manually, create a custom image and use the 'image' runbook parameter, for example: "-v: image:gallery/wait-cloud-init/1.0.1".
# To execute it manually, create a custom image and use the 'image' runbook parameter, for example: "-v: image:gallery/wait-cloud-init/1.0.2".
#
name: "AgentWaitForCloudInit"
tests:
Expand Down
6 changes: 3 additions & 3 deletions tests_e2e/tests/agent_wait_for_cloud_init/add_cloud_init_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ def update(self, template: Dict[str, Any], is_lisa_template: bool) -> None:
#
# cloud-init configuration needs to be added in the osProfile.customData property as a base64-encoded string.
#
# LISA uses the getOSProfile function to generate the value for osProfile; add customData to its output, checking that we do not
# LISA uses the generateOsProfile function to generate the value for osProfile; add customData to its output, checking that we do not
# override any existing value (the current LISA template does not have any).
#
# "getOSProfile": {
# "generateOsProfile": {
# "parameters": [
# ...
# ],
Expand All @@ -55,7 +55,7 @@ def update(self, template: Dict[str, Any], is_lisa_template: bool) -> None:
#
encoded_script = base64.b64encode(AgentWaitForCloudInit.CloudInitScript.encode('utf-8')).decode('utf-8')

get_os_profile = self.get_lisa_function(template, 'getOsProfile')
get_os_profile = self.get_lisa_function(template, 'generateOsProfile')
output = self.get_function_output(get_os_profile)
if output.get('customData') is not None:
raise Exception(f"The getOSProfile function already has a 'customData'. Won't override it. Definition: {get_os_profile}")
Expand Down
Loading