Skip to content

Commit

Permalink
Merge pull request #484 from dem4gus/osd-container-image-owner-aliases
Browse files Browse the repository at this point in the history
Add OWNER_ALIASES and dependabot.yml to osd-container-image
  • Loading branch information
openshift-merge-bot[bot] authored Jan 8, 2025
2 parents 12e6fbe + 6332cff commit 15e2733
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
1 change: 1 addition & 0 deletions boilerplate/openshift/osd-container-image/OWNERS_ALIASES
1 change: 1 addition & 0 deletions boilerplate/openshift/osd-container-image/dependabot.yml
11 changes: 10 additions & 1 deletion boilerplate/openshift/osd-container-image/update
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,22 @@ source $CONVENTION_ROOT/_lib/common.sh
# Expect POST
[[ "$1" == "POST" ]] || err "Got a parameter I don't understand: '$1'. Did the infrastructure change?"

# Add OWNERS_ALIASES to $REPO_ROOT
echo "Copying OWNERS_ALIASES to your repository root."
cp ${HERE}/OWNERS_ALIASES $REPO_ROOT

# Add dependabot configuration
mkdir -p $REPO_ROOT/.github
echo "Copying dependabot.yml to .github/dependabot.yml"
cp ${HERE}/dependabot.yml ${REPO_ROOT}/.github/dependabot.yml

echo "Writing .ci-operator.yaml in your repository root with:"
echo " namespace: $IMAGE_NAMESPACE"
echo " name: $IMAGE_NAME"
echo " tag: $LATEST_IMAGE_TAG"
${SED?} "s/__NAMESPACE__/$IMAGE_NAMESPACE/; s/__NAME__/$IMAGE_NAME/; s/__TAG__/$LATEST_IMAGE_TAG/" ${HERE}/.ci-operator.yaml > $REPO_ROOT/.ci-operator.yaml

cat <<EOF
cat <<'EOF'
=====================
THINGS YOU NEED TO DO
Expand Down
6 changes: 3 additions & 3 deletions boilerplate/update
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ fi

# Prepare the "nexus makefile include".
NEXUS_MK="${CONVENTION_ROOT}/generated-includes.mk"
cat <<EOF>"${NEXUS_MK}"
cat <<'EOF'>"${NEXUS_MK}"
# THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
# This file automatically includes any *.mk files in your subscribed
# conventions. Please ensure your base Makefile includes only this file.
Expand Down Expand Up @@ -200,7 +200,7 @@ for convention in $(scrubbed_conventions $CONFIG_FILE); do
fi
rm -rf "${CONVENTION_ROOT}/${convention}"
mkdir -p $(dirname "${CONVENTION_ROOT}/${convention}")
rsync -a -r --delete "$dir_path" $(dirname "${CONVENTION_ROOT}/${convention}")
rsync -a -r -L --delete "$dir_path" $(dirname "${CONVENTION_ROOT}/${convention}")
if [ -f "${CONVENTION_ROOT}/${convention}/update" ]; then
echo "executing ${CONVENTION_ROOT}/${convention}/update POST"
"${CONVENTION_ROOT}/${convention}/update" POST
Expand All @@ -226,7 +226,7 @@ if [[ -f "${gitattributes}" ]]; then
fi
# .gitattributes is processed in top-down order. Putting these entries at the
# end ensures they take precedence over earlier, manual entries.
cat <<EOF>>"${gitattributes}"
cat <<'EOF'>>"${gitattributes}"
### BEGIN BOILERPLATE GENERATED -- DO NOT EDIT ###
### This block must be the last thing in your ###
### .gitattributes file; otherwise the 'validate' ###
Expand Down

0 comments on commit 15e2733

Please sign in to comment.