Merge pull request #1897 from rabbitmq/test-olm-ci

Final tweaks to OLM workflow

Author: Zerpet

.github/workflows/olm.yml

@@ -70,7 +70,7 @@ jobs:
         env:
           QUAY_IO_OPERATOR_IMAGE: quay.io/rabbitmqoperator/cluster-operator:${{ steps.set_bundle_version.outputs.BUNDLE_VERSION }}
           BUNDLE_VERSION: ${{ steps.set_bundle_version.outputs.BUNDLE_VERSION }}
-          BUNDLE_REPLACES: ${{ steps.set_previous_version.outputs.PREVIOUS_VERSION }}
+          BUNDLE_REPLACES: rabbitmq-cluster-operator.${{ steps.set_previous_version.outputs.PREVIOUS_VERSION }}
         run: make -f olm.mk all
 
       - name: Create OLM Package
@@ -176,10 +176,8 @@ jobs:
       - name: Create branch for OperatorHub PR
         env:
           BUNDLE_VERSION: ${{ needs.test-olm-package.outputs.olm_package_version }}
-          # RABBITMQ_CI_EMAIL: secret_rabbitmq/kv/Shared-Shared-RabbitMQ%2Frabbitmq-ci/details
-          ### operators/rabbitmq-cluster-operator
           GH_PROMPT_DISABLED: 1
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ secrets.RABBITMQ_CI_TOKEN }}
         run: |
           git config user.name "rabbitmq-ci"
           git config user.email ${{ secrets.RABBITMQ_CI_EMAIL }}
@@ -189,11 +187,11 @@ jobs:
           mkdir -pv operators/rabbitmq-cluster-operator/"$BUNDLE_VERSION"
           cp -v -fR olm-package-ci/* ./operators/rabbitmq-cluster-operator/"$BUNDLE_VERSION"/
           git add operators/rabbitmq-cluster-operator
-          git commit -s -m "RabbitMQ Cluster Operator release $BUNDLE_VERSION"
+          git commit -s -m "operator rabbitmq-cluster-operator release $BUNDLE_VERSION"
+          git push --set-upstream origin "rabbitmq-cluster-operator-$BUNDLE_VERSION"
           
           gh pr create --title "operator rabbitmq-cluster-operator (${{ env.BUNDLE_VERSION }})" \
-            --body "Update operator rabbitmq-cluster-operator (${{ needs.test-olm-package.outputs.olm_package_version }})" \
-            --dry-run
+            --body "Update operator rabbitmq-cluster-operator (${{ needs.test-olm-package.outputs.olm_package_version }})"
 
   publish-bundle-redhat-marketplace:
     name: PR Openshift marketplace
@@ -219,7 +217,14 @@ jobs:
           BUNDLE_VERSION: ${{ needs.test-olm-package.outputs.olm_package_version }}
           # RABBITMQ_CI_EMAIL: secret_rabbitmq/kv/Shared-Shared-RabbitMQ%2Frabbitmq-ci/details
           GH_PROMPT_DISABLED: 1
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ secrets.RABBITMQ_CI_TOKEN }}
+        # IMPORTANT: this job does not open the PR automatically because the operator is configured differently in
+        # RedHat marketplace CI. In RedHat Marketplace, we have semver-mode for update strategy, and in operatorhub
+        # we have replaces-mode strategy.
+        # https://k8s-operatorhub.github.io/community-operators/operator-ci-yaml/
+        # As workaround, this job will create the branch with the new version, and a maintainer will make adjustments
+        # before manually opening a PR.
+        # TODO(Zerpet): make update strategy consistent
         run: |
           git config user.name "rabbitmq-ci"
           git config user.email ${{ secrets.RABBITMQ_CI_EMAIL }}
@@ -229,8 +234,5 @@ jobs:
           mkdir -pv operators/rabbitmq-cluster-operator/"$BUNDLE_VERSION"
           cp -v -fR olm-package-ci/* ./operators/rabbitmq-cluster-operator/"$BUNDLE_VERSION"/
           git add operators/rabbitmq-cluster-operator
-          git commit -s -m "RabbitMQ Cluster Operator release $BUNDLE_VERSION"
-          
-          gh pr create --title "operator rabbitmq-cluster-operator (${{ env.BUNDLE_VERSION }})" \
-            --body "Update operator rabbitmq-cluster-operator (${{ needs.test-olm-package.outputs.olm_package_version }})" \
-            --dry-run
+          git commit -s -m "operator rabbitmq-cluster-operator release $BUNDLE_VERSION"
+          git push --set-upstream origin "rabbitmq-cluster-operator-$BUNDLE_VERSION"