diff options
author | Ćukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2018-02-05 17:25:14 +0100 |
---|---|---|
committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2018-02-05 19:15:55 +0000 |
commit | bdfe3a4fa9bd487ec5f40e829742e127476d2c8a (patch) | |
tree | 947ecb04d5e2737883803034ab9885ddab70b816 /tests/data | |
parent | 6aaeb3237653102b5a376986f0ea73327a7a4379 (diff) | |
download | vyos-walinuxagent-bdfe3a4fa9bd487ec5f40e829742e127476d2c8a.tar.gz vyos-walinuxagent-bdfe3a4fa9bd487ec5f40e829742e127476d2c8a.zip |
Import patches-unapplied version 2.2.21-0ubuntu1 to ubuntu/bionic-proposed
Imported using git-ubuntu import.
Changelog parent: 6aaeb3237653102b5a376986f0ea73327a7a4379
New changelog entries:
* New upstream release (LP: #1746628).
* debian/patches/disable_import_test.patch: refreshed patch.
Diffstat (limited to 'tests/data')
-rw-r--r-- | tests/data/ext/sample_ext-1.3.0.zip (renamed from tests/data/ext/sample_ext-1.2.0.zip) | bin | 878 -> 878 bytes | |||
-rw-r--r-- | tests/data/ext/sample_ext-1.3.0/HandlerManifest.json (renamed from tests/data/ext/sample_ext-1.2.0/HandlerManifest.json) | 0 | ||||
-rwxr-xr-x | tests/data/ext/sample_ext-1.3.0/sample.py (renamed from tests/data/ext/sample_ext-1.2.0/sample.py) | 0 | ||||
-rw-r--r-- | tests/data/ga/WALinuxAgent-2.2.14.zip | bin | 500633 -> 0 bytes | |||
-rw-r--r-- | tests/data/ga/WALinuxAgent-2.2.19.zip | bin | 0 -> 514126 bytes | |||
-rw-r--r-- | tests/data/ga/supported.json | 8 | ||||
-rw-r--r-- | tests/data/safe_deploy.json | 23 | ||||
-rw-r--r-- | tests/data/test_waagent.conf | 17 | ||||
-rw-r--r-- | tests/data/wire/ext_conf_autoupgrade_internalversion.xml | 4 | ||||
-rw-r--r-- | tests/data/wire/ext_conf_internalversion.xml | 4 | ||||
-rw-r--r-- | tests/data/wire/ext_conf_upgradeguid.xml | 26 | ||||
-rw-r--r-- | tests/data/wire/ga_manifest.xml | 12 | ||||
-rw-r--r-- | tests/data/wire/ga_manifest_1.xml | 18 | ||||
-rw-r--r-- | tests/data/wire/ga_manifest_2.xml | 24 | ||||
-rw-r--r-- | tests/data/wire/manifest.xml | 16 |
15 files changed, 132 insertions, 20 deletions
diff --git a/tests/data/ext/sample_ext-1.2.0.zip b/tests/data/ext/sample_ext-1.3.0.zip Binary files differindex 08cfaf7..08cfaf7 100644 --- a/tests/data/ext/sample_ext-1.2.0.zip +++ b/tests/data/ext/sample_ext-1.3.0.zip diff --git a/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json b/tests/data/ext/sample_ext-1.3.0/HandlerManifest.json index 9890d0c..9890d0c 100644 --- a/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json +++ b/tests/data/ext/sample_ext-1.3.0/HandlerManifest.json diff --git a/tests/data/ext/sample_ext-1.2.0/sample.py b/tests/data/ext/sample_ext-1.3.0/sample.py index 74bd839..74bd839 100755 --- a/tests/data/ext/sample_ext-1.2.0/sample.py +++ b/tests/data/ext/sample_ext-1.3.0/sample.py diff --git a/tests/data/ga/WALinuxAgent-2.2.14.zip b/tests/data/ga/WALinuxAgent-2.2.14.zip Binary files differdeleted file mode 100644 index a978207..0000000 --- a/tests/data/ga/WALinuxAgent-2.2.14.zip +++ /dev/null diff --git a/tests/data/ga/WALinuxAgent-2.2.19.zip b/tests/data/ga/WALinuxAgent-2.2.19.zip Binary files differnew file mode 100644 index 0000000..dcb8a5a --- /dev/null +++ b/tests/data/ga/WALinuxAgent-2.2.19.zip diff --git a/tests/data/ga/supported.json b/tests/data/ga/supported.json deleted file mode 100644 index 2ae3753..0000000 --- a/tests/data/ga/supported.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "ubuntu.16.10-x64": { - "versions": [ - "^Ubuntu,16.10,yakkety$" - ], - "slice": 10 - } -} diff --git a/tests/data/safe_deploy.json b/tests/data/safe_deploy.json new file mode 100644 index 0000000..9d0e3eb --- /dev/null +++ b/tests/data/safe_deploy.json @@ -0,0 +1,23 @@ +{ + "blacklisted" : [ + "^1.2.3$", + "^1.3(?:\\.\\d+)*$" + ], + + "families" : { + "ubuntu-x64": { + "versions": [ + "^Ubuntu,(1[4-9]|2[0-9])\\.\\d+,.*$" + ], + "require_64bit": true, + "partition": 85 + }, + "fedora-x64": { + "versions": [ + "^Oracle[^,]*,([7-9]|[1-9][0-9])\\.\\d+,.*$", + "^Red\\sHat[^,]*,([7-9]|[1-9][0-9])\\.\\d+,.*$" + ], + "partition": 20 + } + } +}
\ No newline at end of file diff --git a/tests/data/test_waagent.conf b/tests/data/test_waagent.conf index edc3676..be0596a 100644 --- a/tests/data/test_waagent.conf +++ b/tests/data/test_waagent.conf @@ -6,6 +6,7 @@ =Value0 FauxKey1= Value1 FauxKey2=Value2 Value2 +FauxKey3=delalloc,rw,noatime,nobarrier,users,mode=777 # Enable instance creation Provisioning.Enabled=y @@ -19,14 +20,15 @@ Provisioning.DeleteRootPassword=y # Generate fresh host key pair. Provisioning.RegenerateSshHostKeyPair=y -# Supported values are "rsa", "dsa" and "ecdsa". -Provisioning.SshHostKeyPairType=rsa +# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto". +# The "auto" option is supported on OpenSSH 5.9 (2011) and later. +Provisioning.SshHostKeyPairType=rsa # An EOL comment that should be ignored # Monitor host name changes and publish changes via DHCP requests. Provisioning.MonitorHostName=y # Decode CustomData from Base64. -Provisioning.DecodeCustomData=n +Provisioning.DecodeCustomData=n#Another EOL comment that should be ignored # Execute CustomData after provisioning. Provisioning.ExecuteCustomData=n @@ -63,7 +65,7 @@ ResourceDisk.MountOptions=None Logs.Verbose=n # Is FIPS enabled -OS.EnableFIPS=y +OS.EnableFIPS=y#Another EOL comment that should be ignored # Root device timeout in seconds. OS.RootDeviceScsiTimeout=300 @@ -71,6 +73,9 @@ OS.RootDeviceScsiTimeout=300 # If "None", the system default version is used. OS.OpensslPath=None +# Set the SSH ClientAliveInterval +OS.SshClientAliveInterval=42#Yet another EOL comment with a '#' that should be ignored + # Set the path to SSH keys and configuration files OS.SshDir=/notareal/path @@ -119,5 +124,5 @@ OS.SshDir=/notareal/path # Add firewall rules to protect access to Azure host node services # Note: -# - The default is false to protect the state of exising VMs -OS.EnableFirewall=y +# - The default is false to protect the state of existing VMs +OS.EnableFirewall=n diff --git a/tests/data/wire/ext_conf_autoupgrade_internalversion.xml b/tests/data/wire/ext_conf_autoupgrade_internalversion.xml index 1e613ea..9b61556 100644 --- a/tests/data/wire/ext_conf_autoupgrade_internalversion.xml +++ b/tests/data/wire/ext_conf_autoupgrade_internalversion.xml @@ -17,10 +17,10 @@ </GAFamilies> </GuestAgentExtension> <Plugins> - <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.2.0" location="http://rdfepirv2hknprdstr03.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" config="" state="enabled" autoUpgrade="true" failoverlocation="http://rdfepirv2hknprdstr04.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" runAsStartupTask="false" isJson="true" /> + <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.3.0" location="http://rdfepirv2hknprdstr03.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" config="" state="enabled" autoUpgrade="true" failoverlocation="http://rdfepirv2hknprdstr04.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" runAsStartupTask="false" isJson="true" /> </Plugins> <PluginSettings> - <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.2.0"> + <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.3.0"> <RuntimeSettings seqNo="0">{"runtimeSettings":[{"handlerSettings":{"protectedSettingsCertThumbprint":"4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3","protectedSettings":"MIICWgYJK","publicSettings":{"foo":"bar"}}}]}</RuntimeSettings> </Plugin> </PluginSettings> diff --git a/tests/data/wire/ext_conf_internalversion.xml b/tests/data/wire/ext_conf_internalversion.xml index 1e613ea..9b61556 100644 --- a/tests/data/wire/ext_conf_internalversion.xml +++ b/tests/data/wire/ext_conf_internalversion.xml @@ -17,10 +17,10 @@ </GAFamilies> </GuestAgentExtension> <Plugins> - <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.2.0" location="http://rdfepirv2hknprdstr03.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" config="" state="enabled" autoUpgrade="true" failoverlocation="http://rdfepirv2hknprdstr04.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" runAsStartupTask="false" isJson="true" /> + <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.3.0" location="http://rdfepirv2hknprdstr03.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" config="" state="enabled" autoUpgrade="true" failoverlocation="http://rdfepirv2hknprdstr04.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" runAsStartupTask="false" isJson="true" /> </Plugins> <PluginSettings> - <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.2.0"> + <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.3.0"> <RuntimeSettings seqNo="0">{"runtimeSettings":[{"handlerSettings":{"protectedSettingsCertThumbprint":"4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3","protectedSettings":"MIICWgYJK","publicSettings":{"foo":"bar"}}}]}</RuntimeSettings> </Plugin> </PluginSettings> diff --git a/tests/data/wire/ext_conf_upgradeguid.xml b/tests/data/wire/ext_conf_upgradeguid.xml new file mode 100644 index 0000000..1526a93 --- /dev/null +++ b/tests/data/wire/ext_conf_upgradeguid.xml @@ -0,0 +1,26 @@ +<Extensions version="1.0.0.0" goalStateIncarnation="9"><GuestAgentExtension xmlns:i="http://www.w3.org/2001/XMLSchema-instance"> + <GAFamilies> + <GAFamily> + <Name>Prod</Name> + <Uris> + <Uri>http://manifest_of_ga.xml</Uri> + </Uris> + </GAFamily> + <GAFamily> + <Name>Test</Name> + <Uris> + <Uri>http://manifest_of_ga.xml</Uri> + </Uris> + </GAFamily> + </GAFamilies> +</GuestAgentExtension> +<Plugins> + <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.0.0" location="http://rdfepirv2hknprdstr03.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" config="" state="enabled" autoUpgrade="false" failoverlocation="http://rdfepirv2hknprdstr04.blob.core.windows.net/b01058962be54ceca550a390fa5ff064/Microsoft.OSTCExtensions_ExampleHandlerLinux_asiaeast_manifest.xml" runAsStartupTask="false" isJson="true" upgradeGuid="12345678-09AB-ABCD-CDEF-FE0987654321" /> +</Plugins> +<PluginSettings> + <Plugin name="OSTCExtensions.ExampleHandlerLinux" version="1.0.0"> + <RuntimeSettings seqNo="0">{"runtimeSettings":[{"handlerSettings":{"protectedSettingsCertThumbprint":"4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3","protectedSettings":"MIICWgYJK","publicSettings":{"foo":"bar"}}}]}</RuntimeSettings> + </Plugin> +</PluginSettings> +<StatusUploadBlob statusBlobType="BlockBlob">https://yuezhatest.blob.core.windows.net/vhds/test-cs12.test-cs12.test-cs12.status?sr=b&sp=rw&se=9999-01-01&sk=key1&sv=2014-02-14&sig=hfRh7gzUE7sUtYwke78IOlZOrTRCYvkec4hGZ9zZzXo%3D</StatusUploadBlob></Extensions> + diff --git a/tests/data/wire/ga_manifest.xml b/tests/data/wire/ga_manifest.xml index f43daf5..fb7238a 100644 --- a/tests/data/wire/ga_manifest.xml +++ b/tests/data/wire/ga_manifest.xml @@ -14,6 +14,18 @@ </Uris> </Plugin> <Plugin> + <Version>1.1.1</Version> + <Uris> + <Uri>http://foo.bar/zar/OSTCExtensions.WALinuxAgent__1.1.1</Uri> + </Uris> + </Plugin> + <Plugin> + <Version>1.2.0</Version> + <Uris> + <Uri>http://foo.bar/zar/OSTCExtensions.WALinuxAgent__1.2.0</Uri> + </Uris> + </Plugin> + <Plugin> <Version>2.0.0</Version><Uris><Uri>http://host/OSTCExtensions.WALinuxAgent__2.0.0</Uri></Uris> </Plugin> <Plugin> diff --git a/tests/data/wire/ga_manifest_1.xml b/tests/data/wire/ga_manifest_1.xml new file mode 100644 index 0000000..f2b1839 --- /dev/null +++ b/tests/data/wire/ga_manifest_1.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<PluginVersionManifest xmlns:i="http://www.w3.org/2001/XMLSchema-instance"> + <Plugins/> + <InternalPlugins> + <Plugin> + <Version>2.2.13</Version> + <Uris> + <Uri>url1_13</Uri> + </Uris> + </Plugin> + <Plugin> + <Version>2.2.14</Version> + <Uris> + <Uri>url1_14</Uri> + </Uris> + </Plugin> + </InternalPlugins> +</PluginVersionManifest> diff --git a/tests/data/wire/ga_manifest_2.xml b/tests/data/wire/ga_manifest_2.xml new file mode 100644 index 0000000..7636f8c --- /dev/null +++ b/tests/data/wire/ga_manifest_2.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<PluginVersionManifest xmlns:i="http://www.w3.org/2001/XMLSchema-instance"> + <Plugins/> + <InternalPlugins> + <Plugin> + <Version>2.2.13</Version> + <Uris> + <Uri>url2_13</Uri> + </Uris> + </Plugin> + <Plugin> + <Version>2.2.14</Version> + <Uris> + <Uri>url2_14</Uri> + </Uris> + </Plugin> + <Plugin> + <Version>2.2.15</Version> + <Uris> + <Uri>url1_15</Uri> + </Uris> + </Plugin> + </InternalPlugins> +</PluginVersionManifest> diff --git a/tests/data/wire/manifest.xml b/tests/data/wire/manifest.xml index ff42b9d..eef8ade 100644 --- a/tests/data/wire/manifest.xml +++ b/tests/data/wire/manifest.xml @@ -14,6 +14,18 @@ </Uris> </Plugin> <Plugin> + <Version>1.1.1</Version> + <Uris> + <Uri>http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.1.1</Uri> + </Uris> + </Plugin> + <Plugin> + <Version>1.2.0</Version> + <Uris> + <Uri>http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.2.0</Uri> + </Uris> + </Plugin> + <Plugin> <Version>2.0.0</Version><Uris><Uri>http://host/OSTCExtensions.ExampleHandlerLinux__2.0.0</Uri></Uris> </Plugin> <Plugin> @@ -44,9 +56,9 @@ </Plugins> <InternalPlugins> <Plugin> - <Version>1.2.0</Version> + <Version>1.3.0</Version> <Uris> - <Uri>http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.2.0</Uri> + <Uri>http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.3.0</Uri> </Uris> </Plugin> <Plugin> |