chore: fix CI (#2765)

Author: mohammad-alisafaee

.github/workflows/test_deploy.yml

@@ -853,7 +853,7 @@ jobs:
           ref: 'develop'
       - name: merge changes from master
         run: |
-          git merge master
+          git merge origin/master --message "Merge branch 'master' into develop"
           git push
 
   build-images:
@@ -876,8 +876,8 @@ jobs:
         if: "startsWith(github.ref, 'refs/tags/') || endsWith(github.ref, github.event.repository.default_branch)"
         uses: Azure/docker-login@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ secrets.RENKU_DOCKER_USERNAME }}
+          password: ${{ secrets.RENKU_DOCKER_PASSWORD }}
       - name: push images
         if: "startsWith(github.ref, 'refs/tags/') ||  endsWith(github.ref, github.event.repository.default_branch)"
         run: |
@@ -909,8 +909,8 @@ jobs:
         env:
           CHART_NAME: renku-core
           GITHUB_TOKEN: ${{ secrets.RENKUBOT_GITHUB_TOKEN }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_USERNAME: ${{ secrets.RENKU_DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
       - name: Wait for chart to be available
         run: sleep 120
       - name: Update component version