Update Boilerplate

Signed-off-by: Daniel Hall <[email protected]>

Author: smarthall

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-b655ba1347f9bd549afec9f383b5154ca4747c37
+2400affc32091b707df9f1d3045b049f0c11628c

boilerplate/_lib/boilerplate-commit

@@ -56,13 +56,7 @@ elif grep -q '^ M boilerplate/_data/last-boilerplate-commit$' $git_status; then
   bp_compare_url="https://github.com/openshift/boilerplate/compare/$bp_commit_change"
   # Generate the commit history for this range. This will go in the commit message.
   (
-    if [[ -z "${BOILERPLATE_IN_CI}" ]]; then
-      git clone "${BOILERPLATE_GIT_REPO}" "${bp_clone}"
-    else
-      # HACK: We can't get around safe.directory in CI, so just leverage cp instead of git
-      cp -r /go/src/github.com/openshift/boilerplate/* "${bp_clone}"
-      cp -r /go/src/github.com/openshift/boilerplate/.git "${bp_clone}"
-    fi
+    git clone "${BOILERPLATE_GIT_REPO}" "${bp_clone}"
     cd "${bp_clone}"
     # Matches promote.sh
     git log --no-merges --pretty=format:'commit: %H%nauthor: %an%n%s%n%n%b%n%n' $bp_commit_change > $bp_log

boilerplate/openshift/golang-osd-e2e/e2e-template.yml

@@ -77,4 +77,6 @@ objects:
                 - name: GCP_CREDS_JSON
                   value: ${GCP_CREDS_JSON}
                 - name: LOG_BUCKET
-                  value: ${LOG_BUCKET}                 
+                  value: ${LOG_BUCKET}
+                - name: CAD_PAGERDUTY_ROUTING_KEY
+                  value: ${CAD_PAGERDUTY_ROUTING_KEY}                 

boilerplate/update

@@ -109,13 +109,8 @@ EOF
   fi
   BP_CLONE="$(mktemp -d)"
 
-  if [[ -z "${BOILERPLATE_IN_CI}" ]]; then
-    ${BOILERPLATE_GIT_CLONE} "${BOILERPLATE_GIT_REPO}" "${BP_CLONE}"
-  else
-    # HACK: We can't get around safe.directory in CI, so just leverage cp instead of git
-    cp -rf /go/src/github.com/openshift/boilerplate/* "${BP_CLONE}"
-    cp -rf /go/src/github.com/openshift/boilerplate/.git "${BP_CLONE}"
-  fi
+  ${BOILERPLATE_GIT_CLONE} "${BOILERPLATE_GIT_REPO}" "${BP_CLONE}"
+
   echo "Updating the update script."
   rsync -a "${BP_CLONE}/boilerplate/update" "$0"
   echo "Copying utilities"

test/e2e/e2e-template.yml

@@ -77,4 +77,6 @@ objects:
                 - name: GCP_CREDS_JSON
                   value: ${GCP_CREDS_JSON}
                 - name: LOG_BUCKET
-                  value: ${LOG_BUCKET}                 
+                  value: ${LOG_BUCKET}
+                - name: CAD_PAGERDUTY_ROUTING_KEY
+                  value: ${CAD_PAGERDUTY_ROUTING_KEY}