testing only

Author: andrpac

.github/workflows/release-image.yml

@@ -66,7 +66,6 @@ jobs:
   release-image:
     runs-on: ubuntu-latest
     environment: release
-    needs: image2commit
     env:
       VERSION: ${{ github.event.inputs.version || 'test-0.0.0-dev' }}
       AUTHORS: ${{ github.event.inputs.authors || 'unknown' }}
@@ -95,15 +94,15 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: docker.io
-          username: ${{ secrets.ANDRPAC_DOCKER_USERNAME }}
-          password: ${{ secrets.ANDRPAC_DOCKER_PASSWORD }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Log in to Quay registry
         uses: docker/login-action@v3
         with:
           registry: quay.io
-          username: ${{ secrets.ANDRPAC_QUAY_USERNAME }}
-          password: ${{ secrets.ANDRPAC_QUAY_PASSWORD }}
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Log in to Artifactory
         uses: docker/login-action@v3
@@ -112,9 +111,6 @@ jobs:
           username: ${{ secrets.MDB_ARTIFACTORY_USERNAME }}
           password: ${{ secrets.MDB_ARTIFACTORY_PASSWORD }}
 
-      - name: Install devbox
-        uses: jetify-com/[email protected]
-
       # This step configures all of the dynamic variables needed for later steps
       - name: Configure job environment for downstream steps
         id: tags
@@ -135,30 +131,6 @@ jobs:
           echo "quay_certified_image_url=$quay_certified_image_url" >> $GITHUB_OUTPUT
         
       # Move prerelease images to official release registries in Docker Hub and Quay 
-      - name: Move image to Docker registry release from prerelease
-        run: devbox run -- ./scripts/move-image.sh
-        env:
-          IMAGE_SRC_REPO: ${{ env.DOCKER_PRERELEASE_REPO }}
-          IMAGE_DEST_REPO: ${{ env.DOCKER_RELEASE_REPO }}
-          IMAGE_SRC_TAG: ${{ steps.tags.outputs.promoted_tag }}
-          IMAGE_DEST_TAG: ${{ steps.tags.outputs.release_tag }}
-
-      - name: Move image to Quay registry release from prerelease
-        run: devbox run -- ./scripts/move-image.sh
-        env:
-          IMAGE_SRC_REPO: ${{ env.QUAY_PRERELEASE_REPO }}
-          IMAGE_DEST_REPO: ${{ env.QUAY_RELEASE_REPO }}
-          IMAGE_SRC_TAG: ${{ steps.tags.outputs.promoted_tag }}
-          IMAGE_DEST_TAG: ${{ steps.tags.outputs.release_tag }}
-
-      # Create Openshift certified images 
-      - name: Create OpenShift certified image on Quay
-        run: devbox run -- ./scripts/move-image.sh
-        env:
-          IMAGE_SRC_REPO: ${{ env.QUAY_PRERELEASE_REPO }}
-          IMAGE_DEST_REPO: ${{ env.QUAY_RELEASE_REPO }}
-          IMAGE_SRC_TAG: ${{ steps.tags.outputs.promoted_tag }}
-          IMAGE_DEST_TAG: ${{ steps.tags.outputs.certified_tag }}
 
       # Link updates to pr: all-in-one.yml, helm-updates, sdlc requirements
       - name: Generate deployment configurations
@@ -168,55 +140,53 @@ jobs:
           IMAGE_URL: ${{ steps.tags.outputs.docker_image_url }}
 
       - name: Bump Helm chart version
-        run: devbox run -- ./scripts/bump-helm-chart-version.sh
+        run: ./scripts/bump-helm-chart-version.sh
 
       # Prepare SDLC requirement: signatures, sboms, compliance reports
       # Note, signed images will live in mongodb/release and mongodb/signature repos
-      - name: Sign released images
-        run: |
-          devbox run -- make sign IMG="${{ steps.tags.outputs.docker_image_url }}"         SIGNATURE_REPO="${{ env.DOCKER_RELEASE_REPO }}"
-          devbox run -- make sign IMG="${{ steps.tags.outputs.quay_image_url }}"           SIGNATURE_REPO="${{ env.QUAY_RELEASE_REPO }}"
-          devbox run -- make sign IMG="${{ steps.tags.outputs.docker_image_url }}"         SIGNATURE_REPO="${{ env.DOCKER_SIGNATURE_REPO }}"
-          devbox run -- make sign IMG="${{ steps.tags.outputs.quay_certified_image_url }}" SIGNATURE_REPO="${{ env.QUAY_RELEASE_REPO }}"
-          devbox run -- make sign IMG="${{ steps.tags.outputs.quay_certified_image_url }}" SIGNATURE_REPO="${{ env.DOCKER_SIGNATURE_REPO }}"
-        env:
-          PKCS11_URI: ${{ secrets.PKCS11_URI }}
-          GRS_USERNAME: ${{ secrets.GRS_USERNAME }}
-          GRS_PASSWORD: ${{ secrets.GRS_PASSWORD }}
-
-      - name: Generate SBOMs
-        run: devbox run -- make generate-sboms RELEASED_OPERATOR_IMAGE="${{ env.DOCKER_RELEASE_REPO }}"
 
       - name: Create SDLC report
-        run: devbox run -- make gen-sdlc-checklist 
-
+        run: make gen-sdlc-checklist 
+      
       # Create PR on release branch with all updates generated
-      - name: Create release branch with updates, tag new updates
+      - name: Make release changes
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git config --global user.name "${{ steps.generate_token.outputs.user-name }}"
-          git config --global user.email "${{ steps.generate_token.outputs.user-email }}"
-
+          export VERSION="${VERSION}"
           export BRANCH="new-release/${VERSION}"
           export COMMIT_MESSAGE="feat: release ${VERSION} from release-image workflow"
-          export RELEASE_DIR="docs/releases/${VERSION}"
+          export RELEASE_DIR="docs/releases/v${VERSION}"
+
+          git config --global user.name "${{ steps.generate_token.outputs.user-name }}"
+          git config --global user.email "${{ steps.generate_token.outputs.user-email }}"
 
-          git checkout -b "$BRANCH"
-          
           mkdir -p "$RELEASE_DIR"
-          mv deploy "$RELEASE_DIR"/deploy
-          mv bundle "$RELEASE_DIR"/bundle
-          mv bundle.Dockerfile "$RELEASE_DIR"/bundle.Dockerfile
-          
-          git add -f "$RELEASE_DIR"
+          mv deploy "$RELEASE_DIR/deploy"
+          mv bundle "$RELEASE_DIR/bundle"
+          mv bundle.Dockerfile "$RELEASE_DIR/bundle.Dockerfile"
+          mv helm-charts "$RELEASE_DIR/helm-charts"
+
+          git add "$RELEASE_DIR"
+          git commit -m "temp: release content for ${VERSION}"
+
+          export SOURCE_COMMIT=$(git rev-parse HEAD)
+
+          git fetch origin
+          git checkout -b "$BRANCH" origin/main
+          git push origin "$BRANCH"
+
+          git checkout "$SOURCE_COMMIT" -- "$RELEASE_DIR"
+          git add "$RELEASE_DIR"
+
           scripts/create-signed-commit.sh
 
           gh pr create \
             --draft \
-            --head="$BRANCH" \
+            --base main \
+            --head "$BRANCH" \
             --title "$COMMIT_MESSAGE" \
-            --body "This is an autogenerated PR to prepare for the release" 
+            --body "This is an autogenerated PR to prepare for the release"
 
   prepare-environment:
     name: Set up Environment Variables