Running the boilerplate-update in order to refresh the OWNER_ALIAS files.

Author: luis-falcon

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: boilerplate
   namespace: openshift
-  tag: image-v5.0.1
+  tag: image-v6.0.1

Makefile

@@ -1,5 +1,4 @@
 FIPS_ENABLED=true
-export LATEST_IMAGE_TAG=image-v5.0.1
 
 include boilerplate/generated-includes.mk
 

OWNERS_ALIASES

@@ -6,7 +6,7 @@ aliases:
   srep-functional-team-aurora:
     - abyrne55
     - dakotalongRH
-    - lnguyen1401
+    - joshbranham
     - luis-falcon
     - reedcort
   srep-functional-team-fedramp:
@@ -74,7 +74,6 @@ aliases:
     - Nikokolas3270
     - theautoroboto
     - bmeng
-    - mjlshen
     - sam-nguyen7
     - ravitri
     - mmazur

boilerplate/_data/backing-image-tag

@@ -1 +1 @@
-image-v5.0.1
+image-v6.0.1

boilerplate/_data/last-boilerplate-commit

@@ -1 +1 @@
-4c568be6e586dcc46ac00e36b9c298756639c4d9
+3b4c1e2134aed5fa0a995cbef09665a5a415acd0

boilerplate/_lib/common.sh

@@ -89,6 +89,11 @@ image_exists_in_repo() {
 
     local skopeo_stderr=$(mktemp)
 
+    if ! command -v skopeo &>/dev/null; then
+      echo "Failed to find the skopeo binary. If you are on Mac: brew install skopeo." >&2
+      exit 1
+    fi
+
     output=$(skopeo inspect docker://${image_uri} 2>$skopeo_stderr)
     rc=$?
     # So we can delete the temp file right away...
@@ -178,6 +183,8 @@ if [ -z "$BOILERPLATE_GIT_REPO" ]; then
   export BOILERPLATE_GIT_REPO=https://github.com/openshift/boilerplate.git
 fi
 
+# Base image repo url
+IMAGE_REPO=quay.io/redhat-services-prod/openshift
 # The namespace of the ImageStream by which prow will import the image.
 IMAGE_NAMESPACE=openshift
 IMAGE_NAME=boilerplate
@@ -194,4 +201,4 @@ if [[ -z "$LATEST_IMAGE_TAG" ]]; then
     fi
 fi
 # The public image location
-IMAGE_PULL_PATH=${IMAGE_PULL_PATH:-quay.io/app-sre/$IMAGE_NAME:$LATEST_IMAGE_TAG}
+IMAGE_PULL_PATH=${IMAGE_PULL_PATH:-$IMAGE_REPO/$IMAGE_NAME:$LATEST_IMAGE_TAG}

boilerplate/openshift/golang-osd-operator-osde2e/e2e-harness-generate.sh

@@ -25,13 +25,9 @@ export REPLACE_FUNC=$(echo "$REPLACE_SPECNAME" | sed 's/ //g' )
 
 mkdir -p $HARNESS_DIR
 
-E2E_SUITE_BUILDER_IMAGE="registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17"
-if [[ -n ${KONFLUX_BUILDS} ]]; then
-    E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22"
-fi
 
 echo "# THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
-FROM ${E2E_SUITE_BUILDER_IMAGE} as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
 WORKDIR /go/src/github.com/openshift/$OPERATOR_NAME/
 COPY . .
 RUN  CGO_ENABLED=0 GOFLAGS=\"-mod=mod\" go test ./osde2e -v -c --tags=osde2e -o /harness.test

boilerplate/openshift/golang-osd-operator-osde2e/update

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+source $CONVENTION_ROOT/_lib/common.sh
+
+# No PRE
+[[ "$1" == "PRE" ]] && exit 0
+
+# Expect POST
+[[ "$1" == "POST" ]] || err "Got a parameter I don't understand: '$1'. Did the infrastructure change?"
+
+DOCKERFILE=osde2e/Dockerfile
+if [[ -n ${KONFLUX_BUILDS} && -f "${DOCKERFILE}" ]]; then
+    E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.22"
+    ${SED?} -i "2s,.*,FROM $E2E_SUITE_BUILDER_IMAGE AS builder," "${DOCKERFILE}"
+fi

boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES

@@ -6,7 +6,7 @@ aliases:
   srep-functional-team-aurora:
     - abyrne55
     - dakotalongRH
-    - lnguyen1401
+    - joshbranham
     - luis-falcon
     - reedcort
   srep-functional-team-fedramp:
@@ -74,7 +74,6 @@ aliases:
     - Nikokolas3270
     - theautoroboto
     - bmeng
-    - mjlshen
     - sam-nguyen7
     - ravitri
     - mmazur

boilerplate/openshift/golang-osd-operator/csv-generate/csv-generate.sh

@@ -169,7 +169,11 @@ if [[ -z "$SKIP_SAAS_FILE_CHECKS" ]]; then
 
             if [[ "$delete" == false ]]; then
                 short_hash=$(echo "$version" | cut -d- -f2)
-
+                
+                # before comparing the short_hash to the deployment hash, remove the leading g added in https://issues.redhat.com/browse/OSD-13681
+                # short_hash should be 7 char long without the leading g. 
+                [ ${#short_hash} -gt 7 ] && short_hash=${short_hash:1:7}
+                
                 if [[ "$DEPLOYED_HASH" == "${short_hash}"* ]]; then
                     delete=true
                 fi