@@ -135,30 +135,6 @@ jobs:
135135 echo "quay_certified_image_url=$quay_certified_image_url" >> $GITHUB_OUTPUT
136136
137137 # Move prerelease images to official release registries in Docker Hub and Quay
138- - name : Move image to Docker registry release from prerelease
139- run : devbox run -- ./scripts/move-image.sh
140- env :
141- IMAGE_SRC_REPO : ${{ env.DOCKER_PRERELEASE_REPO }}
142- IMAGE_DEST_REPO : ${{ env.DOCKER_RELEASE_REPO }}
143- IMAGE_SRC_TAG : ${{ steps.tags.outputs.promoted_tag }}
144- IMAGE_DEST_TAG : ${{ steps.tags.outputs.release_tag }}
145-
146- - name : Move image to Quay registry release from prerelease
147- run : devbox run -- ./scripts/move-image.sh
148- env :
149- IMAGE_SRC_REPO : ${{ env.QUAY_PRERELEASE_REPO }}
150- IMAGE_DEST_REPO : ${{ env.QUAY_RELEASE_REPO }}
151- IMAGE_SRC_TAG : ${{ steps.tags.outputs.promoted_tag }}
152- IMAGE_DEST_TAG : ${{ steps.tags.outputs.release_tag }}
153-
154- # Create Openshift certified images
155- - name : Create OpenShift certified image on Quay
156- run : devbox run -- ./scripts/move-image.sh
157- env :
158- IMAGE_SRC_REPO : ${{ env.QUAY_PRERELEASE_REPO }}
159- IMAGE_DEST_REPO : ${{ env.QUAY_RELEASE_REPO }}
160- IMAGE_SRC_TAG : ${{ steps.tags.outputs.promoted_tag }}
161- IMAGE_DEST_TAG : ${{ steps.tags.outputs.certified_tag }}
162138
163139 # Link updates to pr: all-in-one.yml, helm-updates, sdlc requirements
164140 - name : Generate deployment configurations
@@ -172,17 +148,6 @@ jobs:
172148
173149 # Prepare SDLC requirement: signatures, sboms, compliance reports
174150 # Note, signed images will live in mongodb/release and mongodb/signature repos
175- - name : Sign released images
176- run : |
177- devbox run -- make sign IMG="${{ steps.tags.outputs.docker_image_url }}" SIGNATURE_REPO="${{ env.DOCKER_RELEASE_REPO }}"
178- devbox run -- make sign IMG="${{ steps.tags.outputs.quay_image_url }}" SIGNATURE_REPO="${{ env.QUAY_RELEASE_REPO }}"
179- devbox run -- make sign IMG="${{ steps.tags.outputs.docker_image_url }}" SIGNATURE_REPO="${{ env.DOCKER_SIGNATURE_REPO }}"
180- devbox run -- make sign IMG="${{ steps.tags.outputs.quay_certified_image_url }}" SIGNATURE_REPO="${{ env.QUAY_RELEASE_REPO }}"
181- devbox run -- make sign IMG="${{ steps.tags.outputs.quay_certified_image_url }}" SIGNATURE_REPO="${{ env.DOCKER_SIGNATURE_REPO }}"
182- env :
183- PKCS11_URI : ${{ secrets.PKCS11_URI }}
184- GRS_USERNAME : ${{ secrets.GRS_USERNAME }}
185- GRS_PASSWORD : ${{ secrets.GRS_PASSWORD }}
186151
187152 - name : Generate SBOMs
188153 run : devbox run -- make generate-sboms RELEASED_OPERATOR_IMAGE="${{ env.DOCKER_RELEASE_REPO }}"
@@ -193,15 +158,15 @@ jobs:
193158 # Create PR on release branch with all updates generated
194159 - name : Create release branch with updates, tag new updates
195160 env :
196- GITHUB_TOKEN : ${{ steps.generate_token.outputs.token }}
161+ GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
197162 run : |
198- git config --global user.name "${{ steps.generate_token.outputs.user-name }}"
199- git config --global user.email "${{ steps.generate_token.outputs.user-email }}"
200-
201163 export BRANCH="new-release/${VERSION}"
202164 export COMMIT_MESSAGE="feat: release ${VERSION} from release-image workflow"
203- export RELEASE_DIR="docs/releases/${VERSION}"
204-
165+ export RELEASE_DIR="docs/releases/v${VERSION}"
166+
167+ git config --global user.name "${{ steps.generate_token.outputs.user-name }}"
168+ git config --global user.email "${{ steps.generate_token.outputs.user-email }}"
169+
205170 git checkout -b "$BRANCH"
206171
207172 mkdir -p "$RELEASE_DIR"
@@ -210,11 +175,13 @@ jobs:
210175 mv bundle.Dockerfile "$RELEASE_DIR"/bundle.Dockerfile
211176
212177 git add -f "$RELEASE_DIR"
213- scripts/create-signed- commit.sh
178+ git commit -m "$COMMIT_MESSAGE"
214179
180+ git push origin "$BRANCH" -ff
215181 gh pr create \
216182 --draft \
217- --head="$BRANCH" \
183+ --base main \
184+ --head "$BRANCH" \
218185 --title "$COMMIT_MESSAGE" \
219186 --body "This is an autogenerated PR to prepare for the release"
220187
0 commit comments