зеркало из https://github.com/Azure/WALinuxAgent.git
fixing custom image test run (#3147)
This commit is contained in:
Родитель
e871f22210
Коммит
bf45d50a1d
|
@ -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 && \
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -35,10 +35,10 @@ class AddCloudInitScript(UpdateArmTemplate):
|
|||
#
|
||||
# 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": [
|
||||
# ...
|
||||
# ],
|
||||
|
@ -55,7 +55,7 @@ class AddCloudInitScript(UpdateArmTemplate):
|
|||
#
|
||||
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}")
|
||||
|
|
Загрузка…
Ссылка в новой задаче