From 05f90dc41eb4eab7e44835b9523d4ef5aa837c69 Mon Sep 17 00:00:00 2001 From: Sergio Valero Date: Mon, 17 Apr 2023 10:51:58 -0400 Subject: [PATCH] refactor: change input name in workflow to build and push images --- .github/workflows/build-push-image-main.yml | 10 ++++++---- .github/workflows/build-push-image-stage.yml | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-push-image-main.yml b/.github/workflows/build-push-image-main.yml index 77a7ca0c863..870d8db781e 100644 --- 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/tutor-mfe.git@v15.0.5" "git+https://github.com/overhangio/tutor-discovery.git@v15.0.0")' + tutor-plugin-sources: '("git+https://github.com/Pearson-Advance/tutor-ecommerce.git@v${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}" "git+https://github.com/overhangio/tutor-mfe.git@v15.0.5" "git+https://github.com/overhangio/tutor-discovery.git@v15.0.0")' 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 index 4f446875f91..1a4cba1d3e0 100644 --- 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/tutor-mfe.git@v15.0.5" "git+https://github.com/overhangio/tutor-discovery.git@v15.0.0")' + tutor-plugin-sources: '("git+https://github.com/Pearson-Advance/tutor-ecommerce.git@v${{ vars.ECOMMERCE_TUTOR_PLUGIN_VERSION }}" "git+https://github.com/overhangio/tutor-mfe.git@v15.0.5" "git+https://github.com/overhangio/tutor-discovery.git@v15.0.0")' tutor-plugin-names: '("ecommerce" "discovery" "mfe")' + tutor-pearson-plugin-url: ${{ vars.TUTOR_PEARSON_PLUGIN_URL }} + tutor-pearson-plugin-name: 'pearson-plugin-ecommerce-stg'