Merge pull request #128 from joyent/master

plitc · web-flow · commit db4624bcc3bb · 2021-04-09T09:44:01.000+02:00
ass-release-20210409
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright 2020 Joyent, Inc.
+ * Copyright 2021 Joyent, Inc.
  */
 
 @Library('jenkins-joylib@v1.0.5') _
@@ -112,7 +112,7 @@ pipeline {
             agent {
                 node {
                     label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
-                    'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
+                    'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
                     customWorkspace "workspace/smartos-${BRANCH_NAME}-check"
                 }
             }
@@ -155,7 +155,7 @@ set -o pipefail
                 // Use ${BRANCH_NAME} instead.
                 node {
                     label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
-                    'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
+                    'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
                     customWorkspace "workspace/smartos-${BRANCH_NAME}-default"
                 }
             }
@@ -202,7 +202,7 @@ export ENGBLD_BITS_UPLOAD_IMGAPI=true
             agent {
                 node {
                     label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
-                        'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
+                        'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
                     customWorkspace "workspace/smartos-${BRANCH_NAME}-debug"
                 }
             }
@@ -251,7 +251,7 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
             agent {
                 node {
                     label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
-                        'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
+                        'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
                     customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc4"
                 }
             }
@@ -294,7 +294,7 @@ export PLATFORM_DEBUG_SUFFIX=-gcc4
             agent {
                 node {
                     label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
-                        'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
+                        'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
                     customWorkspace "workspace/smartos-${BRANCH_NAME}-strap-cache"
                 }
             }
diff --git a/man/usr/share/man/man1m/piadm.1m.md b/man/usr/share/man/man1m/piadm.1m.md
@@ -140,6 +140,16 @@ piadm(1M) -- Manage SmartOS Platform Images
     This directory contains an additional in-directory `platform` link to
     enable its selection as a backup.
 
+## TRITON HEAD NODES
+
+    The piadm(1M) command can convert a USB-key-booting Triton Head Node into
+    a ZFS-pool-booting one.  It can also transfer boot duties from an
+    existing ZFS pool to a new one.
+
+    The `piadm list` subcommand will also show Platform Images available to
+    the Head Node, but it is highly recommended that Head Nodes continue to
+    use sdcadm(1) for such information.
+
 ## COMMANDS
 
     The piadm(1M) command will produce more verbose output if -v is stated
@@ -200,6 +210,18 @@ piadm(1M) -- Manage SmartOS Platform Images
         the head node.  See below for post-bootable iPXE updating on the
         Triton Compute Node.
 
+	For Triton Head Nodes, the -i option is also disabled.  When invoked
+	with -e on a Head Node, the piadm(1M) command will attempt to convert
+	a pool to be bootable for a Triton Head Node.  If a Head Node is
+	booting from a USB key, the boot data comes from the USB Key.  If a
+	Head Node is booting from another pool, the boot data comes from the
+	current booted pool.  After invoking `piadm bootable -e $POOL`, $POOL
+	can boot the Triton Head Node, BUT any pre-reboot operations
+	(regardless if the current Head Node boot comes from USB or an
+	existing bootable pool), will not copy over to the newly-enabled
+	bootable pool.  It is therefore recommended that a Head Node reboot
+	to the newly-enabled pool as soon as possible.
+
       piadm install <source> [ZFS-pool-name]
 
         Installs a new Platform Image into the bootable pool.  If the source

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`/*`
`8`		`- * Copyright 2020 Joyent, Inc.`
	`8`	`+ * Copyright 2021 Joyent, Inc.`
`9`	`9`	`*/`
`10`	`10`
`11`	`11`	`@Library('jenkins-joylib@v1.0.5') _`
`@@ -112,7 +112,7 @@ pipeline {`
`112`	`112`	`agent {`
`113`	`113`	`node {`
`114`	`114`	`label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +`
`115`		`- 'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
	`115`	`+ 'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
`116`	`116`	`customWorkspace "workspace/smartos-${BRANCH_NAME}-check"`
`117`	`117`	`}`
`118`	`118`	`}`
`@@ -155,7 +155,7 @@ set -o pipefail`
`155`	`155`	`// Use ${BRANCH_NAME} instead.`
`156`	`156`	`node {`
`157`	`157`	`label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +`
`158`		`- 'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
	`158`	`+ 'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
`159`	`159`	`customWorkspace "workspace/smartos-${BRANCH_NAME}-default"`
`160`	`160`	`}`
`161`	`161`	`}`
`@@ -202,7 +202,7 @@ export ENGBLD_BITS_UPLOAD_IMGAPI=true`
`202`	`202`	`agent {`
`203`	`203`	`node {`
`204`	`204`	`label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +`
`205`		`- 'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
	`205`	`+ 'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
`206`	`206`	`customWorkspace "workspace/smartos-${BRANCH_NAME}-debug"`
`207`	`207`	`}`
`208`	`208`	`}`
`@@ -251,7 +251,7 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"`
`251`	`251`	`agent {`
`252`	`252`	`node {`
`253`	`253`	`label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +`
`254`		`- 'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
	`254`	`+ 'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
`255`	`255`	`customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc4"`
`256`	`256`	`}`
`257`	`257`	`}`
`@@ -294,7 +294,7 @@ export PLATFORM_DEBUG_SUFFIX=-gcc4`
`294`	`294`	`agent {`
`295`	`295`	`node {`
`296`	`296`	`label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +`
`297`		`- 'dram:8gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
	`297`	`+ 'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'`
`298`	`298`	`customWorkspace "workspace/smartos-${BRANCH_NAME}-strap-cache"`
`299`	`299`	`}`
`300`	`300`	`}`