Skip to content

Commit e199c57

Browse files
committed
Use CodeFlare machine user to push PR into OpenShift community operators repository
1 parent e04fbfa commit e199c57

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Diff for: .github/workflows/tag-and-build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ jobs:
9494
9595
- name: Build bundle and create PR in OpenShift community operators repository
9696
run: |
97-
git config --global user.email "codeflare-ci@redhat.com"
98-
git config --global user.name "CodeFlare CI"
97+
git config --global user.email "138894154+codeflare-[email protected].com"
98+
git config --global user.name "codeflare-machine-account"
9999
make openshift-community-operator-release
100100
env:
101101
VERSION: ${{ github.event.inputs.version }}
102102
PREVIOUS_VERSION: ${{ github.event.inputs.replaces }}
103103
INSTASCALE_VERSION: ${{ github.event.inputs.instascale-version }}
104104
MCAD_VERSION: ${{ github.event.inputs.mcad-version }}
105-
GH_TOKEN: ${{ secrets.GH_PAT }}
105+
GH_TOKEN: ${{ secrets.CODEFLARE_MACHINE_ACCOUNT_TOKEN }}
106106
IMAGE_ORG_BASE: quay.io/${{ github.event.inputs.quay-organization }}
107107
OPERATORS_REPO_FORK_ORG: ${{ github.event.inputs.community-operators-prod-fork-organization }}
108108
OPERATORS_REPO_ORG: ${{ github.event.inputs.community-operators-prod-organization }}
@@ -125,7 +125,7 @@ jobs:
125125
uses: stefanzweifel/git-auto-commit-action@v4
126126
with:
127127
commit_message: Update dependency versions for release ${{ github.event.inputs.version }}
128-
file_pattern: 'README.md controllers/defaults.go *.yaml *.tmpl Makefile'
128+
file_pattern: 'README.md controllers/defaults.go *.yaml Makefile'
129129

130130
- name: Creates a release in GitHub
131131
run: |

Diff for: Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,11 @@ bundle-push: ## Push the bundle image.
368368

369369
.PHONY: openshift-community-operator-release
370370
openshift-community-operator-release: install-gh-cli bundle ## build bundle and create PR in OpenShift community operators repository
371-
git clone https://$(GH_TOKEN)@github.com/$(OPERATORS_REPO_FORK_ORG)/community-operators-prod.git
371+
git clone https://x-access-token:$(GH_TOKEN)@github.com/$(OPERATORS_REPO_FORK_ORG)/community-operators-prod.git
372372
cd community-operators-prod && git remote add upstream https://github.com/$(OPERATORS_REPO_ORG)/community-operators-prod.git && git pull upstream main && git push origin main
373373
cp -r bundle community-operators-prod/operators/codeflare-operator/$(BUNDLE_VERSION)
374-
cd community-operators-prod && git checkout -b codeflare-release-$(BUNDLE_VERSION) && git add operators/codeflare-operator/$(BUNDLE_VERSION)/* && git commit -m "add bundle manifests codeflare version $(BUNDLE_VERSION)" && git push origin codeflare-release-$(BUNDLE_VERSION)
375-
gh pr create --repo $(OPERATORS_REPO_FORK_ORG)/community-operators-prod --title "CodeFlare $(BUNDLE_VERSION)" --body "New release of codeflare operator" --head $(OPERATORS_REPO_ORG):codeflare-release-$(BUNDLE_VERSION) --base main
374+
cd community-operators-prod && git checkout -b codeflare-release-$(BUNDLE_VERSION) && git add operators/codeflare-operator/$(BUNDLE_VERSION)/* && git commit -m "add bundle manifests codeflare version $(BUNDLE_VERSION)" --signoff && git push origin codeflare-release-$(BUNDLE_VERSION)
375+
gh pr create --repo $(OPERATORS_REPO_ORG)/community-operators-prod --title "CodeFlare $(BUNDLE_VERSION)" --body "New release of codeflare operator" --head $(OPERATORS_REPO_FORK_ORG):codeflare-release-$(BUNDLE_VERSION) --base main
376376
rm -rf community-operators-prod
377377

378378
.PHONY: opm

0 commit comments

Comments
 (0)