run: use shorter suffix in service names (#1835)

Co-authored-by: F. Hinkelmann <[email protected]>

Author: grayside

.kokoro/build-with-run.sh

@@ -16,6 +16,12 @@
 
 set -eo pipefail
 
+_run_error_log() {
+  echo "error: line $(caller)"
+}
+
+trap '_run_error_log' ERR
+
 # Activate mocha config
 export MOCHA_REPORTER_OUTPUT=${PROJECT}_sponge_log.xml
 export MOCHA_REPORTER=xunit
@@ -37,12 +43,14 @@ gcloud config set project $GOOGLE_CLOUD_PROJECT
 
 # Version is in the format <PR#>-<GIT COMMIT SHA>.
 # Ensures PR-based triggers of the same branch don't collide if Kokoro attempts
-# to run them concurrently.
+# to run them concurrently. Defaults to 'latest'.
 export SAMPLE_VERSION="${KOKORO_GIT_COMMIT:-latest}"
 export SAMPLE_NAME="$(basename $(pwd))"
 
-# Builds not triggered by a PR will fall back to the commit hash then "latest".
-SUFFIX=${KOKORO_BUILD_ID}
+# Cloud Run has a max service name length, $KOKORO_BUILD_ID is too long to guarantee no conflict deploys.
+set -x
+export SUFFIX="$(cat /dev/urandom | LC_CTYPE=C tr -dc 'a-z0-9' | head -c 15)"
+set +x
 export SERVICE_NAME="${SAMPLE_NAME}-${SUFFIX}"
 export CONTAINER_IMAGE="gcr.io/${GOOGLE_CLOUD_PROJECT}/run-${SAMPLE_NAME}:${SAMPLE_VERSION}"
 

run/hello-broken/s.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+find . -name '*.sh' -not -path "./testing/*" -exec shellcheck -f gcc {} \;

run/hello-broken/test/cloudrun-ci.js

@@ -14,15 +14,15 @@
 
 const assert = require('assert');
 const request = require('got');
+const {resolve} = require('url');
 
 const get = (route, base_url) => {
   const {ID_TOKEN} = process.env;
   if (!ID_TOKEN) {
     throw Error('"ID_TOKEN" environment variable is required.');
   }
 
-  return request(route, {
-    baseUrl: base_url.trim(),
+  return request(resolve(base_url.trim(), route), {
     headers: {
       Authorization: `Bearer ${ID_TOKEN.trim()}`,
     },