Merge branch 'master' into master

furlongm · Dec 16, 2020 · 6be4343 · 6be4343
2 parents 7ea948f + e3dd63c
commit 6be4343
Show file tree

Hide file tree

Showing 560 changed files with 30,394 additions and 7,162 deletions.
diff --git a/README.md b/README.md
@@ -19,21 +19,23 @@ The templates in this repo require a current version of packer, (1.3.4+) and in
 
 ## Pending Tasks
 
-Add retry function to scripts and wrap yum/apt/apk/pacman/etc (prototype in silent.sh already)  
-Automatically retry failed box builds  
-Generate docker variants for the RHEL/Oracle/Ubuntu/Debian/Alpine configurations  
+Generate docker variants for the Ubuntu/Debian/Alpine configurations  
 Add upload/delete/release functions to robox.sh  
 Add vagrant user password randomization logic to the bundled Vagrantfiles  
 Add init based test, and SSH command test to the box test and check script  
-Ad `IPQoS lowdelay throughput` to the relevant configs to solve the [OpenSSH bug](https://github.com/hashicorp/vagrant/issues/10730)
-
 
 ## Pending Additions
 
-[Devuan 1.0/2.0](https://devuan.org/)  
+Submit a pull request with your favorite distro.
 
 ## Operating System Requests
 
+The following variants of existing builds have been requested, and will be added at a future date, when time allows (or someone submits a pull request).
+
+[CentOS Stream](https://software.opensuse.org/distributions/tumbleweed)
+[Fedora Rawhide](https://fedoraproject.org/wiki/Releases/Rawhide)
+[OpenSUSE Tumbleweed](https://www.centos.org/centos-stream/)
+
 The following operating systems have been requested by a member of the robox community, but require a volunteer, so they can be incorporated into the robox workflow.
 
 [Haiku](https://www.haiku-os.org/get-haiku/)  
@@ -49,8 +51,6 @@ Manjaro
 Mint  
 OpenSolaris  
 OpenSUSE Leap v15 (already building v42.3)  
-Oracle v6 (already building v7)  
-Scientific Linux v6/v7  
 Slackware  
 
 MacOS  
@@ -73,4 +73,4 @@ Bitcoin
 Bitcoin Cash
 qqxyedtn68jg84w4mkd3vsw2nu6pgkydnudza0ed0m
 
-[Robxes](https://roboxes.org) is maintained by Ladar Levison, with infrastructure provided by [Hacking and Coffee LLC](https://hackingand.coffee), and [Lavabit LLC](https://lavabit.com).
+[Roboxes](https://roboxes.org) is maintained by Ladar Levison, with infrastructure provided by [Hacking and Coffee LLC](https://hackingand.coffee), and [Lavabit LLC](https://lavabit.com).
diff --git a/developer-hyperv.json b/developer-hyperv.json
@@ -6,10 +6,11 @@
         {
             "type": "shell",
             "scripts": [
+                "scripts/centos6/yum.sh",
                 "scripts/centos6/base.sh",
                 "scripts/centos6/network.sh"
             ],
-            "start_retry_timeout": "15m",
+            "start_retry_timeout": "45m",
             "expect_disconnect": "true",
             "only": [
                 "magma-developer-hyperv"
@@ -34,7 +35,7 @@
                 "scripts/centos6/cleanup.sh"
             ],
             "pause_before": "120s",
-            "start_retry_timeout": "15m",
+            "start_retry_timeout": "45m",
             "expect_disconnect": "true",
             "only": [
                 "magma-developer-hyperv"
@@ -51,7 +52,7 @@
                 "scripts/common/lockout.sh"
             ],
             "type": "shell",
-            "start_retry_timeout": "15m",
+            "start_retry_timeout": "45m",
             "expect_disconnect": "true"
         }
     ],
@@ -67,16 +68,15 @@
                 "<tab> ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/magma.centos6.developer.ks<enter><wait>"
             ],
             "disk_size": 131072,
-            "memory": 1024,
+            "memory": 2048,
             "cpus": 4,
             "http_directory": "http",
-            "iso_url": "https://mirrors.edge.kernel.org/centos/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
-            "iso_checksum": "7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
-            "iso_checksum_type": "sha256",
+            "iso_url": "https://vault.centos.org/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+            "iso_checksum": "sha256:7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
             "ssh_username": "root",
             "ssh_password": "magma",
             "ssh_port": 22,
-            "ssh_timeout": "3600s",
+            "ssh_timeout": "9800s",
             "shutdown_command": "sudo -S shutdown -P now",
             "generation": 1,
             "headless": true,

diff --git a/developer-libvirt.json b/developer-libvirt.json
@@ -6,6 +6,7 @@
         {
             "type": "shell",
             "scripts": [
+                "scripts/centos6/yum.sh",
                 "scripts/centos6/base.sh",
                 "scripts/centos6/network.sh"
             ],
@@ -68,29 +69,24 @@
                 "<tab> ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/magma.centos6.developer.ks<enter><wait>"
             ],
             "format": "qcow2",
-            "disk_size": 131072,
+            "disk_size": "131072",
             "disk_discard": "unmap",
+            "disk_detect_zeroes": "unmap",
             "disk_cache": "unsafe",
+            "disk_image": false,
             "disk_compression": true,
             "disk_interface": "virtio-scsi",
             "net_device": "virtio-net",
             "cpus": 4,
             "memory": 4096,
-            "qemuargs": [
-                [
-                    "-drive",
-                    "if=none,file=output/magma-developer-libvirt/magma-developer-libvirt,id=drive0,cache=unsafe,discard=unmap,detect-zeroes=unmap,format=qcow2"
-                ]
-            ],
             "http_directory": "http",
             "headless": true,
-            "iso_url": "https://mirrors.edge.kernel.org/centos/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
-            "iso_checksum": "7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
-            "iso_checksum_type": "sha256",
+            "iso_url": "https://vault.centos.org/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+            "iso_checksum": "sha256:7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
             "ssh_username": "root",
             "ssh_password": "magma",
             "ssh_port": 22,
-            "ssh_wait_timeout": "3600s",
+            "ssh_timeout": "3600s",
             "shutdown_command": "sudo -S shutdown -P now"
         }
     ],

diff --git a/developer-ova.json b/developer-ova.json
@@ -6,6 +6,7 @@
         {
             "type": "shell",
             "scripts": [
+                "scripts/centos6/yum.sh",
                 "scripts/centos6/base.sh",
                 "scripts/centos6/network.sh"
             ],
@@ -70,7 +71,9 @@
             "disk_type_id": "0",
             "cpus": 4,
             "memory": 4096,
+            "version": "12",
             "vmx_data_post": {
+              "virtualHW.version": "12",
               "cleanShutdown": "TRUE",
               "softPowerOff": "FALSE",
               "ethernet0.virtualDev": "e1000",
@@ -83,14 +86,13 @@
             "vnc_disable_password": true,
             "vnc_bind_address": "127.0.0.1",
             "vmx_remove_ethernet_interfaces": false,
-            "iso_url": "https://mirrors.edge.kernel.org/centos/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
-            "iso_checksum": "7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
-            "iso_checksum_type": "sha256",
+            "iso_url": "https://vault.centos.org/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+            "iso_checksum": "sha256:7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
             "skip_compaction": false,
             "ssh_username": "root",
             "ssh_password": "magma",
             "ssh_port": 22,
-            "ssh_wait_timeout": "7200s",
+            "ssh_timeout": "7200s",
             "shutdown_command": "sudo -S shutdown -P now",
             "tools_upload_flavor": "linux"
         }

diff --git a/developer-virtualbox.json b/developer-virtualbox.json
@@ -6,6 +6,7 @@
         {
             "type": "shell",
             "scripts": [
+                "scripts/centos6/yum.sh",
                 "scripts/centos6/base.sh",
                 "scripts/centos6/network.sh"
             ],
@@ -82,16 +83,15 @@
             "vrdp_bind_address": "127.0.0.1",
             "vrdp_port_min": 11000,
             "vrdp_port_max": 12000,
-            "iso_url": "https://mirrors.edge.kernel.org/centos/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
-            "iso_checksum": "7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
-            "iso_checksum_type": "sha256",
+            "iso_url": "https://vault.centos.org/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+            "iso_checksum": "sha256:7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
             "ssh_username": "root",
             "ssh_password": "magma",
             "ssh_port": 22,
-            "ssh_wait_timeout": "7200s",
+            "ssh_timeout": "7200s",
             "shutdown_command": "sudo -S shutdown -P now",
-            "guest_additions_url": "http://download.virtualbox.org/virtualbox/5.2.30/VBoxGuestAdditions_5.2.30.iso",
-            "guest_additions_sha256": "dd07da975f346608b0f6843f4be4bfdf48b4610ef49a0c0e6aa689ef81c1bd69",
+            "guest_additions_url": "https://download.virtualbox.org/virtualbox/5.2.44/VBoxGuestAdditions_5.2.44.iso",
+            "guest_additions_sha256": "9883ee443a309f4ffa1d5dee2833f9e35ced598686c36d159f410e5edbac1ca4",
             "guest_additions_path": "VBoxGuestAdditions.iso",
             "virtualbox_version_file": "VBoxVersion.txt"
         }

diff --git a/developer-vmware.json b/developer-vmware.json
@@ -6,6 +6,7 @@
         {
             "type": "shell",
             "scripts": [
+                "scripts/centos6/yum.sh",
                 "scripts/centos6/base.sh",
                 "scripts/centos6/network.sh"
             ],
@@ -70,7 +71,9 @@
             "disk_type_id": "0",
             "cpus": 4,
             "memory": 4096,
+            "version": "12",
             "vmx_data_post": {
+              "virtualHW.version": "12",
               "cleanShutdown": "TRUE",
               "softPowerOff": "FALSE",
               "ethernet0.virtualDev": "e1000",
@@ -83,14 +86,13 @@
             "vnc_disable_password": true,
             "vnc_bind_address": "127.0.0.1",
             "vmx_remove_ethernet_interfaces": true,
-            "iso_url": "https://mirrors.edge.kernel.org/centos/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
-            "iso_checksum": "7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
-            "iso_checksum_type": "sha256",
+            "iso_url": "https://vault.centos.org/6.10/isos/x86_64/CentOS-6.10-x86_64-minimal.iso",
+            "iso_checksum": "sha256:7c0dee2a0494dabd84809b72ddb4b761f9ef92b78a506aef709b531c54d30770",
             "skip_compaction": false,
             "ssh_username": "root",
             "ssh_password": "magma",
             "ssh_port": 22,
-            "ssh_wait_timeout": "7200s",
+            "ssh_timeout": "7200s",
             "shutdown_command": "sudo -S shutdown -P now",
             "tools_upload_flavor": "linux"
         }