From bdfe3a4fa9bd487ec5f40e829742e127476d2c8a Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Mon, 5 Feb 2018 17:25:14 +0100 Subject: 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. --- tests/data/ext/sample_ext-1.2.0.zip | Bin 878 -> 0 bytes .../data/ext/sample_ext-1.2.0/HandlerManifest.json | 14 -------- tests/data/ext/sample_ext-1.2.0/sample.py | 37 --------------------- tests/data/ext/sample_ext-1.3.0.zip | Bin 0 -> 878 bytes .../data/ext/sample_ext-1.3.0/HandlerManifest.json | 14 ++++++++ tests/data/ext/sample_ext-1.3.0/sample.py | 37 +++++++++++++++++++++ tests/data/ga/WALinuxAgent-2.2.14.zip | Bin 500633 -> 0 bytes tests/data/ga/WALinuxAgent-2.2.19.zip | Bin 0 -> 514126 bytes tests/data/ga/supported.json | 8 ----- tests/data/safe_deploy.json | 23 +++++++++++++ tests/data/test_waagent.conf | 17 ++++++---- .../wire/ext_conf_autoupgrade_internalversion.xml | 4 +-- tests/data/wire/ext_conf_internalversion.xml | 4 +-- tests/data/wire/ext_conf_upgradeguid.xml | 26 +++++++++++++++ tests/data/wire/ga_manifest.xml | 12 +++++++ tests/data/wire/ga_manifest_1.xml | 18 ++++++++++ tests/data/wire/ga_manifest_2.xml | 24 +++++++++++++ tests/data/wire/manifest.xml | 16 +++++++-- 18 files changed, 183 insertions(+), 71 deletions(-) delete mode 100644 tests/data/ext/sample_ext-1.2.0.zip delete mode 100644 tests/data/ext/sample_ext-1.2.0/HandlerManifest.json delete mode 100755 tests/data/ext/sample_ext-1.2.0/sample.py create mode 100644 tests/data/ext/sample_ext-1.3.0.zip create mode 100644 tests/data/ext/sample_ext-1.3.0/HandlerManifest.json create mode 100755 tests/data/ext/sample_ext-1.3.0/sample.py delete mode 100644 tests/data/ga/WALinuxAgent-2.2.14.zip create mode 100644 tests/data/ga/WALinuxAgent-2.2.19.zip delete mode 100644 tests/data/ga/supported.json create mode 100644 tests/data/safe_deploy.json create mode 100644 tests/data/wire/ext_conf_upgradeguid.xml create mode 100644 tests/data/wire/ga_manifest_1.xml create mode 100644 tests/data/wire/ga_manifest_2.xml (limited to 'tests/data') diff --git a/tests/data/ext/sample_ext-1.2.0.zip b/tests/data/ext/sample_ext-1.2.0.zip deleted file mode 100644 index 08cfaf7..0000000 Binary files a/tests/data/ext/sample_ext-1.2.0.zip and /dev/null differ diff --git a/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json b/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json deleted file mode 100644 index 9890d0c..0000000 --- a/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json +++ /dev/null @@ -1,14 +0,0 @@ -[{ - "name": "ExampleHandlerLinux", - "version": 1.0, - "handlerManifest": { - "installCommand": "sample.py -install", - "uninstallCommand": "sample.py -uninstall", - "updateCommand": "sample.py -update", - "enableCommand": "sample.py -enable", - "disableCommand": "sample.py -disable", - "rebootAfterInstall": false, - "reportHeartbeat": false - } -}] - diff --git a/tests/data/ext/sample_ext-1.2.0/sample.py b/tests/data/ext/sample_ext-1.2.0/sample.py deleted file mode 100755 index 74bd839..0000000 --- a/tests/data/ext/sample_ext-1.2.0/sample.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -import os - - -def get_seq(): - latest_seq = -1 - config_dir = os.path.join(os.getcwd(), "config") - if os.path.isdir(config_dir): - for item in os.listdir(config_dir): - item_path = os.path.join(config_dir, item) - if os.path.isfile(item_path): - separator = item.rfind(".") - if separator > 0 and item[separator + 1:] == "settings": - sequence = int(item[0: separator]) - if sequence > latest_seq: - latest_seq = sequence - return latest_seq - - -succeed_status = """ -[{ - "status": { - "status": "success" - } -}] -""" - -if __name__ == "__main__": - seq = get_seq() - if seq >= 0: - status_path = os.path.join(os.getcwd(), "status") - if not os.path.exists(status_path): - os.makedirs(status_path) - status_file = os.path.join(status_path, "{0}.status".format(seq)) - with open(status_file, "w+") as status: - status.write(succeed_status) diff --git a/tests/data/ext/sample_ext-1.3.0.zip b/tests/data/ext/sample_ext-1.3.0.zip new file mode 100644 index 0000000..08cfaf7 Binary files /dev/null and b/tests/data/ext/sample_ext-1.3.0.zip differ diff --git a/tests/data/ext/sample_ext-1.3.0/HandlerManifest.json b/tests/data/ext/sample_ext-1.3.0/HandlerManifest.json new file mode 100644 index 0000000..9890d0c --- /dev/null +++ b/tests/data/ext/sample_ext-1.3.0/HandlerManifest.json @@ -0,0 +1,14 @@ +[{ + "name": "ExampleHandlerLinux", + "version": 1.0, + "handlerManifest": { + "installCommand": "sample.py -install", + "uninstallCommand": "sample.py -uninstall", + "updateCommand": "sample.py -update", + "enableCommand": "sample.py -enable", + "disableCommand": "sample.py -disable", + "rebootAfterInstall": false, + "reportHeartbeat": false + } +}] + diff --git a/tests/data/ext/sample_ext-1.3.0/sample.py b/tests/data/ext/sample_ext-1.3.0/sample.py new file mode 100755 index 0000000..74bd839 --- /dev/null +++ b/tests/data/ext/sample_ext-1.3.0/sample.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python + +import os + + +def get_seq(): + latest_seq = -1 + config_dir = os.path.join(os.getcwd(), "config") + if os.path.isdir(config_dir): + for item in os.listdir(config_dir): + item_path = os.path.join(config_dir, item) + if os.path.isfile(item_path): + separator = item.rfind(".") + if separator > 0 and item[separator + 1:] == "settings": + sequence = int(item[0: separator]) + if sequence > latest_seq: + latest_seq = sequence + return latest_seq + + +succeed_status = """ +[{ + "status": { + "status": "success" + } +}] +""" + +if __name__ == "__main__": + seq = get_seq() + if seq >= 0: + status_path = os.path.join(os.getcwd(), "status") + if not os.path.exists(status_path): + os.makedirs(status_path) + status_file = os.path.join(status_path, "{0}.status".format(seq)) + with open(status_file, "w+") as status: + status.write(succeed_status) diff --git a/tests/data/ga/WALinuxAgent-2.2.14.zip b/tests/data/ga/WALinuxAgent-2.2.14.zip deleted file mode 100644 index a978207..0000000 Binary files a/tests/data/ga/WALinuxAgent-2.2.14.zip and /dev/null differ diff --git a/tests/data/ga/WALinuxAgent-2.2.19.zip b/tests/data/ga/WALinuxAgent-2.2.19.zip new file mode 100644 index 0000000..dcb8a5a Binary files /dev/null and b/tests/data/ga/WALinuxAgent-2.2.19.zip differ 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 @@ - + - + {"runtimeSettings":[{"handlerSettings":{"protectedSettingsCertThumbprint":"4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3","protectedSettings":"MIICWgYJK","publicSettings":{"foo":"bar"}}}]} 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 @@ - + - + {"runtimeSettings":[{"handlerSettings":{"protectedSettingsCertThumbprint":"4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3","protectedSettings":"MIICWgYJK","publicSettings":{"foo":"bar"}}}]} 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 @@ + + + + Prod + + http://manifest_of_ga.xml + + + + Test + + http://manifest_of_ga.xml + + + + + + + + + + {"runtimeSettings":[{"handlerSettings":{"protectedSettingsCertThumbprint":"4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3","protectedSettings":"MIICWgYJK","publicSettings":{"foo":"bar"}}}]} + + +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 + 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 @@ -13,6 +13,18 @@ http://foo.bar/zar/OSTCExtensions.WALinuxAgent__1.1.0 + + 1.1.1 + + http://foo.bar/zar/OSTCExtensions.WALinuxAgent__1.1.1 + + + + 1.2.0 + + http://foo.bar/zar/OSTCExtensions.WALinuxAgent__1.2.0 + + 2.0.0http://host/OSTCExtensions.WALinuxAgent__2.0.0 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 @@ + + + + + + 2.2.13 + + url1_13 + + + + 2.2.14 + + url1_14 + + + + 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 @@ + + + + + + 2.2.13 + + url2_13 + + + + 2.2.14 + + url2_14 + + + + 2.2.15 + + url1_15 + + + + 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 @@ -13,6 +13,18 @@ http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.1.0 + + 1.1.1 + + http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.1.1 + + + + 1.2.0 + + http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.2.0 + + 2.0.0http://host/OSTCExtensions.ExampleHandlerLinux__2.0.0 @@ -44,9 +56,9 @@ - 1.2.0 + 1.3.0 - http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.2.0 + http://foo.bar/zar/OSTCExtensions.ExampleHandlerLinux__1.3.0 -- cgit v1.2.3