OS-8422 Give gcc10 (alternate-compiler) its own directory in .../public/builds/.

Reviewed by: Brian Bennett <brian.bennett@mnx.io>
Approved by: Brian Bennett <brian.bennett@mnx.io>

Jenkinsfile

@@ -274,6 +274,9 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
                     sh('''
 export PLAT_CONFIGURE_ARGS="-p gcc10 -r $PLAT_CONFIGURE_ARGS"
 # enough to make sure we don't pollute the main Manta dir
+# Also for now we implicitly promise that the gcc10 deliverables are DEBUG,
+# but we could choose to make -gcc10 *and* -debug-gcc10 stages later and alter
+# PLATFORM_DEBUG_SUFFIX accordingly.
 export PLATFORM_DEBUG_SUFFIX=-gcc10
 ./tools/build_jenkins -c -d -S gcc10
                     ''')

Makefile

@@ -485,8 +485,11 @@ usb: live
 # below add suffixes to the bits-dir copies of these files as appropriate.
 # The 'PUB_' prefix below indicates published build artifacts.
 #
+# This is all overridden if PLATFORM_DEBUG_SUFFIX is defined in the environment,
+# however.
+#
 ifeq ($(ILLUMOS_ENABLE_DEBUG),exclusive)
-    PLATFORM_DEBUG_SUFFIX = -debug
+    PLATFORM_DEBUG_SUFFIX ?= -debug
 endif
 
 BUILD_NAME			?= platform

tools/build_jenkins

@@ -28,6 +28,9 @@ if [[ -z "${ENGBLD_DEST_OUT_PATH}" ]]; then
     export ENGBLD_DEST_OUT_PATH=/public/builds
 fi
 
+export TIMESTAMP=$(TZ=UTC /bin/date "+%Y%m%dT%H%M%SZ")
+export BUILDSTAMP=${TIMESTAMP}
+
 # Used to flag if this is a non-default build. This modifies the description
 # used for the platform manifest.
 export ENGBLD_CUSTOM=''
@@ -126,7 +129,7 @@ while getopts "cdhF:S:" opt; do
         d)
             # build debug platform bits
             ENGBLD_CONFIGURE_DEBUG_ARG='-d'
-            ENGBLD_DEBUG_SUFFIX='-debug'
+            ENGBLD_DEBUG_SUFFIX=${PLATFORM_DEBUG_SUFFIX:--debug}
             ;;
         F)
             PLATFORM_BUILD_FLAVOR="${OPTARG}"
@@ -144,28 +147,6 @@ while getopts "cdhF:S:" opt; do
 done
 shift $((OPTIND - 1))
 
-case "$JENKINS_STAGE_NAME" in
-    default)
-	# No sleep
-        ;;
-    debug)
-	# No sleep
-        ;;
-    *)
-	# Delay one minute to avoid STAMP collisions with default/debug
-	# stages, which are invariant and have their own directories.
-	# (stages here get put in platform-debug because they get -d,
-	# typically).
-	#
-	# Once we give manta build/ directories to stages, this could
-	# be eliminated.
-	echo "Sleeping 60 secs for $JENKINS_STAGE_NAME stage"
-	sleep 60
-	;;
-esac
-export TIMESTAMP=$(TZ=UTC /bin/date "+%Y%m%dT%H%M%SZ")
-export BUILDSTAMP=${TIMESTAMP}
-
 if [[ -z "$PLATFORM_BUILD_FLAVOR" ]]; then
     PLATFORM_BUILD_FLAVOR="triton"
 fi