Merge pull request #35 from Pearson-Advance/vue/PADV-377

PADV-377 - Update inputs in build and push workflows
Pearson-Advance · May 9, 2023 · 6525723 · 6525723
2 parents 1b15f4f + 05f90dc
commit 6525723
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build-push-image-main.yml b/.github/workflows/build-push-image-main.yml
@@ -6,7 +6,7 @@ on:
       - 'pearson-release/olive.main'
 
 jobs:
-  docker:
+  Build:
     runs-on: ubuntu-latest
     steps:
       - name: Get current time
@@ -20,11 +20,13 @@ jobs:
           python-version: ${{ vars.BUILD_PYTHON_VERSION }}
           tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
           path-image-to-be-built: 'env/plugins/ecommerce/build/ecommerce'
-          repository-name: ${{ vars.BUILD_MAIN_REPOSITORY_NAME }}
-          image-name: ${{ vars.BUILD_MAIN_IMAGE_NAME }}
+          organization-name: ${{ vars.BUILD_ORGANIZATION_NAME }}
+          repository-name: ${{ vars.BUILD_REPOSITORY_NAME }}
           image-tag: ${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}-${{ steps.current-time.outputs.formattedTime }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           use-docker-cache: ${{ vars.BUILD_USE_CACHE }}
-          tutor-plugin-sources: '("git+https://github.com/overhangio/tutor-ecommerce.git@v${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}" "git+https://github.com/overhangio/[email protected]" "git+https://github.com/overhangio/[email protected]")'
+          tutor-plugin-sources: '("git+https://github.com/Pearson-Advance/tutor-ecommerce.git@v${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}" "git+https://github.com/overhangio/[email protected]" "git+https://github.com/overhangio/[email protected]")'
           tutor-plugin-names: '("ecommerce" "discovery" "mfe")'
+          tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }}
+          tutor-pearson-plugin-name: 'pearson-plugin-ecommerce-prod'
diff --git a/.github/workflows/build-push-image-stage.yml b/.github/workflows/build-push-image-stage.yml
@@ -6,7 +6,7 @@ on:
       - 'pearson-release/olive.stage'
 
 jobs:
-  docker:
+  Build:
     runs-on: ubuntu-latest
     steps:
       - name: Get current time
@@ -20,11 +20,13 @@ jobs:
           python-version: ${{ vars.BUILD_PYTHON_VERSION }}
           tutor-version: ${{ vars.BUILD_TUTOR_VERSION }}
           path-image-to-be-built: 'env/plugins/ecommerce/build/ecommerce'
-          repository-name: ${{ vars.BUILD_STAGE_REPOSITORY_NAME }}
-          image-name: ${{ vars.BUILD_STAGE_IMAGE_NAME }}
+          organization-name: ${{ vars.BUILD_ORGANIZATION_NAME }}
+          repository-name: ${{ vars.BUILD_REPOSITORY_NAME }}
           image-tag: ${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}-RC-${{ steps.current-time.outputs.formattedTime }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
           use-docker-cache: ${{ vars.BUILD_USE_CACHE }}
-          tutor-plugin-sources: '("git+https://github.com/overhangio/tutor-ecommerce.git@v${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}" "git+https://github.com/overhangio/[email protected]" "git+https://github.com/overhangio/[email protected]")'
+          tutor-plugin-sources: '("git+https://github.com/Pearson-Advance/tutor-ecommerce.git@v${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}" "git+https://github.com/overhangio/[email protected]" "git+https://github.com/overhangio/[email protected]")'
           tutor-plugin-names: '("ecommerce" "discovery" "mfe")'
+          tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }}
+          tutor-pearson-plugin-name: 'pearson-plugin-ecommerce-stg'