From bebb4b28db6a3fd0a4b51a3291b55e07b978b453 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Thu, 20 Apr 2023 15:28:23 -0400 Subject: [PATCH 01/35] First Skeleton --- .github/workflows/deploy-pm4.yml | 91 ++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 .github/workflows/deploy-pm4.yml diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml new file mode 100644 index 0000000000..da3bbc3b62 --- /dev/null +++ b/.github/workflows/deploy-pm4.yml @@ -0,0 +1,91 @@ +name: BUILD-PM4 +on: + push: + branches: + - kr-github-actions + #pull_request: + # types: [opened, reopened, synchronize, edited] + #schedule: + # - cron: '0 0 * * *' # every day at midnight + #workflow_dispatch: + #pull_request: + # branches: + # - main +env: + SHA: ${{github.event.pull_request.head.sha}} + PROJECT: ${{github.event.pull_request.head.repo.name}} + BODY: ${{github.event.pull_request.body}} + PACKAGE_URL: ${{github.event.pull_request.head.repo.ssh_url}} + PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} + MY_GITHUB_TOKEN: ${{ secrets.GH_STATUS_TOKEN }} + GITHUB_TOKEN: ${{ secrets.MY_GH_TOKEN }} + GIT_TOKEN: ${{ secrets.MY_GH_TOKEN }} + OWNER: ${{ github.event.pull_request.head.repo.owner.login }} + #Other Parameters + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + CI_PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} + CI_PROJECT: ${{github.event.pull_request.head.repo.name}} +jobs: + job1: + name: set-init-github-status + runs-on: ubuntu-20.04 + steps: + - run: ls -la + - uses: actions/checkout@v3 + - run: ls -la + job2: + name: build-stm-image + needs: job1 + runs-on: ubuntu-20.04 + env: + # set image tag + IMAGE_TAG: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") #"${CI_PROJECT}-test" + steps: + - name: Push the image to ECR + run: | + echo "Second Step" + job3: + name: deploy-stm + needs: job2 + runs-on: ubuntu-20.04 + steps: + - name: my-step + run: | + ls -la + pwd + echo "third Step" + job4: + name: run-phpunit + needs: job2 + runs-on: ubuntu-20.04 + steps: + - name: my-step + run: | + echo "fourth Step" + job5: + name: run-benchmarks + needs: job3 + runs-on: ubuntu-20.04 + steps: + - name: my-step + run: | + echo "Fifth Step" + job6: + name: run-cypress + needs: job3 + runs-on: ubuntu-20.04 + steps: + - name: my-step + run: | + echo "fourth Step" + job7: + name: run-cypress-qa + needs: job3 + runs-on: ubuntu-20.04 + steps: + - name: my-step + run: | + echo "Sixt Step" + From ec0cdb8a86c7aa579cc353235a839f8780df22ec Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 11:16:00 -0400 Subject: [PATCH 02/35] Second Commit --- .github/workflows/deploy-pm4.yml | 139 ++++++++++++++++++++++++------- 1 file changed, 111 insertions(+), 28 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index da3bbc3b62..b1f1d16f32 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -17,53 +17,136 @@ env: BODY: ${{github.event.pull_request.body}} PACKAGE_URL: ${{github.event.pull_request.head.repo.ssh_url}} PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} - MY_GITHUB_TOKEN: ${{ secrets.GH_STATUS_TOKEN }} - GITHUB_TOKEN: ${{ secrets.MY_GH_TOKEN }} - GIT_TOKEN: ${{ secrets.MY_GH_TOKEN }} + MY_GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} OWNER: ${{ github.event.pull_request.head.repo.owner.login }} #Other Parameters aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - CI_PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} - CI_PROJECT: ${{github.event.pull_request.head.repo.name}} + aws-region: ${{ secrets.AWS_REGION }} + aws-url: ${{ secrets.AWS_URL }} + STM_TOKEN: ${{ secrets.STM_TOKEN }} + CI_PACKAGE_BRANCH: 4.6.0-RC7-product #rc5-test #feature/FOUR-7380 #${{github.event.pull_request.head.ref}} + CI_PROJECT: processmaker #${{github.event.pull_request.head.repo.name}} + CI_TEST: $CI_PROJECT + IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") jobs: - job1: - name: set-init-github-status - runs-on: ubuntu-20.04 - steps: - - run: ls -la - - uses: actions/checkout@v3 - - run: ls -la + #job1: + # name: set-init-github-status + # runs-on: ubuntu-20.04 + # steps: + # - run: ls -la + # - uses: actions/checkout@v3 + # - run: ls -la job2: name: build-stm-image - needs: job1 - runs-on: ubuntu-20.04 - env: - # set image tag - IMAGE_TAG: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") #"${CI_PROJECT}-test" + #needs: job1 + runs-on: ubuntu-20.04 steps: - - name: Push the image to ECR + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + #Additional + echo "CI_PR_BODY=1" >> $GITHUB_ENV + echo "CI_PROJECT=processmaker" >> $GITHUB_ENV + #echo "CI_PACKAGE_BRANCH=feature/FOUR-7380" >> $GITHUB_ENV + echo "CACHEBUSTER=abc" >> $GITHUB_ENV + - name: Clone Repo STM run: | - echo "Second Step" + git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Build and Push the image to ECR + run: | + cd pm4-stm-docker + docker stop $(docker ps -a -q) || true + docker container prune -f + docker-compose down -v + if [ $build_base_image = true ]; then + docker-compose build base --no-cache + docker-compose build cache --no-cache + fi + echo "FALSE OPTION" + docker-compose build processmaker + docker push ${IMAGE} job3: - name: deploy-stm + name: deploy-stm needs: job2 runs-on: ubuntu-20.04 - steps: - - name: my-step + container: + image: cimg/php:7.4 + options: --user root + steps: + - name: Export Params run: | - ls -la - pwd - echo "third Step" + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE_TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "STM_TOKEN=${{env.STM_TOKEN}}" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Deploy STM + run: | + mkdir -p /tmp/workspace + cd pm4-stm-docker/deploy-stm + composer install --no-dev + php -i | grep "Loaded Configuration File" + php run.php + php -v job4: name: run-phpunit needs: job2 runs-on: ubuntu-20.04 steps: - - name: my-step + - name: Export Params run: | - echo "fourth Step" + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: PHPUnits + run: | + echo $IMAGE + cd pm4-stm-docker + docker pull $IMAGE + docker-compose down -v + docker-compose build + docker-compose run phpunit job5: name: run-benchmarks needs: job3 From 965d3ddc1a136c0974895381780fcc0300fdc6e7 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 11:24:16 -0400 Subject: [PATCH 03/35] Second Commit --- .github/workflows/deploy-pm4.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index b1f1d16f32..67b6eec7d0 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -59,7 +59,7 @@ jobs: git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -100,7 +100,7 @@ jobs: git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -131,7 +131,7 @@ jobs: git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 4d61b8d8b1aced07c52f9921e91026d857c6b62c Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 12:26:43 -0400 Subject: [PATCH 04/35] Second Commit --- .github/workflows/deploy-pm4.yml | 104 ++++++++++++++++++------------- 1 file changed, 61 insertions(+), 43 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 67b6eec7d0..552e48ea0a 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -57,16 +57,25 @@ jobs: - name: Clone Repo STM run: | git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker + cd pm4-stm-docker - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 + aws-region: us-east-1 + - name: Login to ECR + run: | + aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + #- name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v2 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: us-east-1 + #- name: Login to Amazon ECR + # id: login-ecr + # uses: aws-actions/amazon-ecr-login@v1 - name: Build and Push the image to ECR run: | cd pm4-stm-docker @@ -98,16 +107,25 @@ jobs: - name: Clone Repo STM run: | git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker + cd pm4-stm-docker - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 + aws-region: us-east-1 + - name: Login to ECR + run: | + aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + #- name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v2 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: us-east-1 + #- name: Login to Amazon ECR + # id: login-ecr + # uses: aws-actions/amazon-ecr-login@v1 - name: Deploy STM run: | mkdir -p /tmp/workspace @@ -116,37 +134,37 @@ jobs: php -i | grep "Loaded Configuration File" php run.php php -v - job4: - name: run-phpunit - needs: job2 - runs-on: ubuntu-20.04 - steps: - - name: Export Params - run: | - echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - - name: Clone Repo STM - run: | - git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v2 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - - name: PHPUnits - run: | - echo $IMAGE - cd pm4-stm-docker - docker pull $IMAGE - docker-compose down -v - docker-compose build - docker-compose run phpunit + #job4: + # name: run-phpunit + # needs: job2 + # runs-on: ubuntu-20.04 + # steps: + # - name: Export Params + # run: | + # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # - name: Clone Repo STM + # run: | + # git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + # cd pm4-stm-docker + # - name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v2 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: us-east-1 + # - name: Login to Amazon ECR + # id: login-ecr + # uses: aws-actions/amazon-ecr-login@v1 + # - name: PHPUnits + # run: | + # echo $IMAGE + # cd pm4-stm-docker + # docker pull $IMAGE + # docker-compose down -v + # docker-compose build + # docker-compose run phpunit job5: name: run-benchmarks needs: job3 From 94d763284b0d5fb30fd11a84bd20d5307f72d474 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 12:34:31 -0400 Subject: [PATCH 05/35] Second Commit --- .github/workflows/deploy-pm4.yml | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 552e48ea0a..a4201206ee 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -58,15 +58,15 @@ jobs: run: | git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to ECR - run: | - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + #- name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: us-east-1 + #- name: Login to ECR + # run: | + # aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker #- name: Configure AWS Credentials # uses: aws-actions/configure-aws-credentials@v2 # with: @@ -108,15 +108,15 @@ jobs: run: | git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to ECR - run: | - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + #- name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # aws-region: us-east-1 + #- name: Login to ECR + # run: | + # aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker #- name: Configure AWS Credentials # uses: aws-actions/configure-aws-credentials@v2 # with: From e1ca01245c362f6d97d57e64d164a81d5895a3be Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 12:40:52 -0400 Subject: [PATCH 06/35] Second Commit --- .github/workflows/deploy-pm4.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index a4201206ee..36f218cbe5 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -42,7 +42,7 @@ jobs: job2: name: build-stm-image #needs: job1 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Export Params run: | @@ -54,16 +54,16 @@ jobs: echo "CI_PROJECT=processmaker" >> $GITHUB_ENV #echo "CI_PACKAGE_BRANCH=feature/FOUR-7380" >> $GITHUB_ENV echo "CACHEBUSTER=abc" >> $GITHUB_ENV - - name: Clone Repo STM - run: | - git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - #- name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 + #- name: Clone Repo STM + # run: | + # git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + # cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 #- name: Login to ECR # run: | # aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker From 439993c1f6770ef669037f89f118136178a8aca5 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 12:49:39 -0400 Subject: [PATCH 07/35] Second Commit --- .github/workflows/deploy-pm4.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 36f218cbe5..52465e4d1c 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -61,8 +61,8 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-access-key-id: AKIAI3EZWK42QVYDQOGA + aws-secret-access-key: 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 aws-region: us-east-1 #- name: Login to ECR # run: | From 5ffd4e098fec5d2fddfd147db91568a6f088eca3 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 12:53:11 -0400 Subject: [PATCH 08/35] Second Commit --- .github/workflows/deploy-pm4.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 52465e4d1c..d3f4bfbd2e 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -7,7 +7,7 @@ on: # types: [opened, reopened, synchronize, edited] #schedule: # - cron: '0 0 * * *' # every day at midnight - #workflow_dispatch: + workflow_dispatch: #pull_request: # branches: # - main @@ -61,8 +61,8 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: AKIAI3EZWK42QVYDQOGA - aws-secret-access-key: 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 + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 #- name: Login to ECR # run: | From ac6ab5528c213dd4a9b00b8e4844a2ed424477e8 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 9 May 2023 12:55:51 -0400 Subject: [PATCH 09/35] Second Commit --- .github/workflows/deploy-pm4.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index d3f4bfbd2e..821ce9df77 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -31,6 +31,8 @@ env: CI_PROJECT: processmaker #${{github.event.pull_request.head.repo.name}} CI_TEST: $CI_PROJECT IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") +permissions: + contents: read jobs: #job1: # name: set-init-github-status From e471512f98761fae85a3eb611ed29993cefb4659 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 10 May 2023 09:51:03 -0400 Subject: [PATCH 10/35] Validate repo --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 821ce9df77..d03884693e 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -60,7 +60,7 @@ jobs: # run: | # git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker # cd pm4-stm-docker - - name: Configure AWS Credentials + - name: Configure AWS Credentials1 uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} From fd84ea49437d185664923eafc9efd9ab500c31a1 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 10 May 2023 12:02:12 -0400 Subject: [PATCH 11/35] Validate Keys --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index d03884693e..3e60efb5f9 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -42,7 +42,7 @@ jobs: # - uses: actions/checkout@v3 # - run: ls -la job2: - name: build-stm-image + name: build-stm-image1 #needs: job1 runs-on: ubuntu-22.04 steps: From 25f2e14befd892af139d2f3b6852d9699a57cf5c Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 10 May 2023 12:09:54 -0400 Subject: [PATCH 12/35] Validate Build PM4 --- .github/workflows/deploy-pm4.yml | 94 ++++++++++++++++---------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 3e60efb5f9..df04e684fb 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -56,19 +56,19 @@ jobs: echo "CI_PROJECT=processmaker" >> $GITHUB_ENV #echo "CI_PACKAGE_BRANCH=feature/FOUR-7380" >> $GITHUB_ENV echo "CACHEBUSTER=abc" >> $GITHUB_ENV - #- name: Clone Repo STM - # run: | - # git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - # cd pm4-stm-docker + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker - name: Configure AWS Credentials1 uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - #- name: Login to ECR - # run: | - # aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + - name: Login to ECR + run: | + aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker #- name: Configure AWS Credentials # uses: aws-actions/configure-aws-credentials@v2 # with: @@ -110,15 +110,15 @@ jobs: run: | git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - #- name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 - #- name: Login to ECR - # run: | - # aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Login to ECR + run: | + aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker #- name: Configure AWS Credentials # uses: aws-actions/configure-aws-credentials@v2 # with: @@ -136,37 +136,37 @@ jobs: php -i | grep "Loaded Configuration File" php run.php php -v - #job4: - # name: run-phpunit - # needs: job2 - # runs-on: ubuntu-20.04 - # steps: - # - name: Export Params - # run: | - # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # - name: Clone Repo STM - # run: | - # git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - # cd pm4-stm-docker - # - name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v2 - # with: - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 - # - name: Login to Amazon ECR - # id: login-ecr - # uses: aws-actions/amazon-ecr-login@v1 - # - name: PHPUnits - # run: | - # echo $IMAGE - # cd pm4-stm-docker - # docker pull $IMAGE - # docker-compose down -v - # docker-compose build - # docker-compose run phpunit + job4: + name: run-phpunit + needs: job2 + runs-on: ubuntu-20.04 + steps: + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: PHPUnits + run: | + echo $IMAGE + cd pm4-stm-docker + docker pull $IMAGE + docker-compose down -v + docker-compose build + docker-compose run phpunit job5: name: run-benchmarks needs: job3 From 9c4ee8bd443863f6c36e46d4d15908231e1ea2b0 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 10 May 2023 12:12:20 -0400 Subject: [PATCH 13/35] Validate Build PM4 --- .github/workflows/deploy-pm4.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index df04e684fb..2188d3b48a 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -151,14 +151,14 @@ jobs: git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 + aws-region: us-east-1 + - name: Login to ECR + run: | + aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker - name: PHPUnits run: | echo $IMAGE From 2b0a5228169e5c7f26d7313fbe7474c7b2b25ed5 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Fri, 12 May 2023 13:01:35 -0400 Subject: [PATCH 14/35] Validate Deploy --- .github/workflows/deploy-pm4.yml | 123 ++++++++++++------------------- 1 file changed, 47 insertions(+), 76 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 2188d3b48a..c3872069de 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -7,7 +7,7 @@ on: # types: [opened, reopened, synchronize, edited] #schedule: # - cron: '0 0 * * *' # every day at midnight - workflow_dispatch: + #workflow_dispatch: #pull_request: # branches: # - main @@ -17,9 +17,9 @@ env: BODY: ${{github.event.pull_request.body}} PACKAGE_URL: ${{github.event.pull_request.head.repo.ssh_url}} PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} - MY_GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} + #MY_GITHUB_TOKEN: ${{ secrets.GH_STATUS_TOKEN }} GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} - GIT_TOKEN: ${{ secrets.GIT_TOKEN }} + #GIT_TOKEN: ${{ secrets.MY_GH_TOKEN }} OWNER: ${{ github.event.pull_request.head.repo.owner.login }} #Other Parameters aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -27,12 +27,10 @@ env: aws-region: ${{ secrets.AWS_REGION }} aws-url: ${{ secrets.AWS_URL }} STM_TOKEN: ${{ secrets.STM_TOKEN }} - CI_PACKAGE_BRANCH: 4.6.0-RC7-product #rc5-test #feature/FOUR-7380 #${{github.event.pull_request.head.ref}} + CI_PACKAGE_BRANCH: 4.6.0-RC7-product #4.6.0-RC7-product #rc5-test #feature/FOUR-7380 #${{github.event.pull_request.head.ref}} CI_PROJECT: processmaker #${{github.event.pull_request.head.repo.name}} CI_TEST: $CI_PROJECT IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") -permissions: - contents: read jobs: #job1: # name: set-init-github-status @@ -42,63 +40,48 @@ jobs: # - uses: actions/checkout@v3 # - run: ls -la job2: - name: build-stm-image1 + name: build-stm-image #needs: job1 - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - name: Export Params - run: | + run: | echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV #Additional echo "CI_PR_BODY=1" >> $GITHUB_ENV echo "CI_PROJECT=processmaker" >> $GITHUB_ENV - #echo "CI_PACKAGE_BRANCH=feature/FOUR-7380" >> $GITHUB_ENV echo "CACHEBUSTER=abc" >> $GITHUB_ENV - name: Clone Repo STM run: | - git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - - name: Configure AWS Credentials1 + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} - name: Login to ECR - run: | - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker - #- name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v2 - # with: - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 - #- name: Login to Amazon ECR - # id: login-ecr - # uses: aws-actions/amazon-ecr-login@v1 + run: | + aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - name: Build and Push the image to ECR run: | cd pm4-stm-docker docker stop $(docker ps -a -q) || true docker container prune -f - docker-compose down -v - if [ $build_base_image = true ]; then - docker-compose build base --no-cache - docker-compose build cache --no-cache - fi - echo "FALSE OPTION" + docker-compose down -v docker-compose build processmaker docker push ${IMAGE} job3: name: deploy-stm needs: job2 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: cimg/php:7.4 options: --user root - steps: + steps: - name: Export Params run: | echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV @@ -108,38 +91,27 @@ jobs: echo "STM_TOKEN=${{env.STM_TOKEN}}" >> $GITHUB_ENV - name: Clone Repo STM run: | - git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to ECR - run: | - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker - #- name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v2 - # with: - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: us-east-1 - #- name: Login to Amazon ECR - # id: login-ecr - # uses: aws-actions/amazon-ecr-login@v1 + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 - name: Deploy STM - run: | - mkdir -p /tmp/workspace - cd pm4-stm-docker/deploy-stm - composer install --no-dev - php -i | grep "Loaded Configuration File" + run: | + mkdir -p /tmp/workspace + cd pm4-stm-docker/deploy-stm + composer install --no-dev php run.php - php -v job4: name: run-phpunit needs: job2 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Export Params run: | @@ -148,29 +120,28 @@ jobs: echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - name: Clone Repo STM run: | - git clone --depth 1 -b cicd "https://$GIT_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker cd pm4-stm-docker - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Login to ECR - run: | - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/processmaker + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 - name: PHPUnits - run: | - echo $IMAGE - cd pm4-stm-docker - docker pull $IMAGE - docker-compose down -v - docker-compose build - docker-compose run phpunit + run: | + cd pm4-stm-docker + docker pull $IMAGE + docker-compose down -v + docker-compose build + docker-compose run phpunit job5: name: run-benchmarks needs: job3 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: my-step run: | @@ -178,7 +149,7 @@ jobs: job6: name: run-cypress needs: job3 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: my-step run: | @@ -186,7 +157,7 @@ jobs: job7: name: run-cypress-qa needs: job3 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: my-step run: | From 351e81aedea86ba75ec92bbbafd5983ae87d35f6 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Mon, 15 May 2023 12:22:40 -0400 Subject: [PATCH 15/35] Validate repo --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index c3872069de..f95d6237cf 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -40,7 +40,7 @@ jobs: # - uses: actions/checkout@v3 # - run: ls -la job2: - name: build-stm-image + name: build-stm-image1 #needs: job1 runs-on: ubuntu-22.04 steps: From 197d8e1ff7b0b4b8cd68b86663cae357693d8dc3 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Mon, 15 May 2023 12:40:01 -0400 Subject: [PATCH 16/35] Validate repo --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index f95d6237cf..c3872069de 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -40,7 +40,7 @@ jobs: # - uses: actions/checkout@v3 # - run: ls -la job2: - name: build-stm-image1 + name: build-stm-image #needs: job1 runs-on: ubuntu-22.04 steps: From bba1437f00d3926369e2875b53a367747b57c597 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 16 May 2023 13:15:47 -0400 Subject: [PATCH 17/35] Validate new Branchs --- .github/workflows/deploy-pm4.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index c3872069de..447bf3d7a3 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -1,10 +1,10 @@ name: BUILD-PM4 on: - push: - branches: - - kr-github-actions - #pull_request: - # types: [opened, reopened, synchronize, edited] + #push: + # branches: + # - kr-github-actions + pull_request: + types: [opened, reopened, synchronize, edited] #schedule: # - cron: '0 0 * * *' # every day at midnight #workflow_dispatch: @@ -27,8 +27,8 @@ env: aws-region: ${{ secrets.AWS_REGION }} aws-url: ${{ secrets.AWS_URL }} STM_TOKEN: ${{ secrets.STM_TOKEN }} - CI_PACKAGE_BRANCH: 4.6.0-RC7-product #4.6.0-RC7-product #rc5-test #feature/FOUR-7380 #${{github.event.pull_request.head.ref}} - CI_PROJECT: processmaker #${{github.event.pull_request.head.repo.name}} + CI_PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} #4.6.0-RC7-product #4.6.0-RC7-product #rc5-test #feature/FOUR-7380 #${{github.event.pull_request.head.ref}} + CI_PROJECT: ${{github.event.pull_request.head.repo.name}} #processmaker CI_TEST: $CI_PROJECT IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") jobs: From 1208a0033ecf79d71782924356554372419714cd Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 30 May 2023 18:22:16 -0400 Subject: [PATCH 18/35] Validate deploy STM --- .github/workflows/deploy-pm4.yml | 135 +++++++++++++++---------------- 1 file changed, 67 insertions(+), 68 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 447bf3d7a3..0ed5b65979 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -27,8 +27,8 @@ env: aws-region: ${{ secrets.AWS_REGION }} aws-url: ${{ secrets.AWS_URL }} STM_TOKEN: ${{ secrets.STM_TOKEN }} - CI_PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} #4.6.0-RC7-product #4.6.0-RC7-product #rc5-test #feature/FOUR-7380 #${{github.event.pull_request.head.ref}} - CI_PROJECT: ${{github.event.pull_request.head.repo.name}} #processmaker + CI_PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} + CI_PROJECT: ${{github.event.pull_request.head.repo.name}} CI_TEST: $CI_PROJECT IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") jobs: @@ -39,44 +39,43 @@ jobs: # - run: ls -la # - uses: actions/checkout@v3 # - run: ls -la - job2: - name: build-stm-image - #needs: job1 - runs-on: ubuntu-22.04 - steps: - - name: Export Params - run: | - echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - #Additional - echo "CI_PR_BODY=1" >> $GITHUB_ENV - echo "CI_PROJECT=processmaker" >> $GITHUB_ENV - echo "CACHEBUSTER=abc" >> $GITHUB_ENV - - name: Clone Repo STM - run: | - git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ env.aws-access-key-id }} - aws-secret-access-key: ${{ env.aws-secret-access-key }} - aws-region: ${{ env.aws-region }} - - name: Login to ECR - run: | - aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - - name: Build and Push the image to ECR - run: | - cd pm4-stm-docker - docker stop $(docker ps -a -q) || true - docker container prune -f - docker-compose down -v - docker-compose build processmaker - docker push ${IMAGE} + #job2: + # name: build-stm-image + # #needs: job1 + # runs-on: ubuntu-22.04 + # steps: + # - name: Export Params + # run: | + # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # #Additional + # echo "CI_PR_BODY=1" >> $GITHUB_ENV + # echo "CACHEBUSTER=abc" >> $GITHUB_ENV + # - name: Clone Repo STM + # run: | + # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + # cd pm4-stm-docker + # - name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ env.aws-access-key-id }} + # aws-secret-access-key: ${{ env.aws-secret-access-key }} + # aws-region: ${{ env.aws-region }} + # - name: Login to ECR + # run: | + # aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} + # - name: Build and Push the image to ECR + # run: | + # cd pm4-stm-docker + # docker stop $(docker ps -a -q) || true + # docker container prune -f + # docker-compose down -v + # docker-compose build processmaker + # docker push ${IMAGE} job3: name: deploy-stm - needs: job2 + #needs: job2 runs-on: ubuntu-22.04 container: image: cimg/php:7.4 @@ -108,36 +107,36 @@ jobs: cd pm4-stm-docker/deploy-stm composer install --no-dev php run.php - job4: - name: run-phpunit - needs: job2 - runs-on: ubuntu-22.04 - steps: - - name: Export Params - run: | - echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - - name: Clone Repo STM - run: | - git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ env.aws-access-key-id }} - aws-secret-access-key: ${{ env.aws-secret-access-key }} - aws-region: ${{ env.aws-region }} - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - - name: PHPUnits - run: | - cd pm4-stm-docker - docker pull $IMAGE - docker-compose down -v - docker-compose build - docker-compose run phpunit + #job4: + # name: run-phpunit + # needs: job2 + # runs-on: ubuntu-22.04 + # steps: + # - name: Export Params + # run: | + # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # - name: Clone Repo STM + # run: | + # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + # cd pm4-stm-docker + # - name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ env.aws-access-key-id }} + # aws-secret-access-key: ${{ env.aws-secret-access-key }} + # aws-region: ${{ env.aws-region }} + # - name: Login to Amazon ECR + # id: login-ecr + # uses: aws-actions/amazon-ecr-login@v1 + # - name: PHPUnits + # run: | + # cd pm4-stm-docker + # docker pull $IMAGE + # docker-compose down -v + # docker-compose build + # docker-compose run phpunit job5: name: run-benchmarks needs: job3 From 3a7d28512cbf396738f77017b71a6d8ba32d0150 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 30 May 2023 19:57:51 -0400 Subject: [PATCH 19/35] Validate Branch kr-github-actions --- .github/workflows/deploy-pm4.yml | 152 +++++++++++++++---------------- 1 file changed, 72 insertions(+), 80 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 0ed5b65979..ffa5111043 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -31,51 +31,43 @@ env: CI_PROJECT: ${{github.event.pull_request.head.repo.name}} CI_TEST: $CI_PROJECT IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") -jobs: - #job1: - # name: set-init-github-status - # runs-on: ubuntu-20.04 - # steps: - # - run: ls -la - # - uses: actions/checkout@v3 - # - run: ls -la - #job2: - # name: build-stm-image - # #needs: job1 - # runs-on: ubuntu-22.04 - # steps: - # - name: Export Params - # run: | - # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # #Additional - # echo "CI_PR_BODY=1" >> $GITHUB_ENV - # echo "CACHEBUSTER=abc" >> $GITHUB_ENV - # - name: Clone Repo STM - # run: | - # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - # cd pm4-stm-docker - # - name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ env.aws-access-key-id }} - # aws-secret-access-key: ${{ env.aws-secret-access-key }} - # aws-region: ${{ env.aws-region }} - # - name: Login to ECR - # run: | - # aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - # - name: Build and Push the image to ECR - # run: | - # cd pm4-stm-docker - # docker stop $(docker ps -a -q) || true - # docker container prune -f - # docker-compose down -v - # docker-compose build processmaker - # docker push ${IMAGE} - job3: +jobs: + job1: + name: build-stm-image + runs-on: ubuntu-22.04 + steps: + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + #Additional + echo "CI_PR_BODY=1" >> $GITHUB_ENV + echo "CACHEBUSTER=abc" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} + - name: Login to ECR + run: | + aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} + - name: Build and Push the image to ECR + run: | + cd pm4-stm-docker + docker stop $(docker ps -a -q) || true + docker container prune -f + docker-compose down -v + docker-compose build processmaker + docker push ${IMAGE} + job2: name: deploy-stm - #needs: job2 + needs: job1 runs-on: ubuntu-22.04 container: image: cimg/php:7.4 @@ -107,55 +99,55 @@ jobs: cd pm4-stm-docker/deploy-stm composer install --no-dev php run.php - #job4: - # name: run-phpunit - # needs: job2 - # runs-on: ubuntu-22.04 - # steps: - # - name: Export Params - # run: | - # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # - name: Clone Repo STM - # run: | - # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - # cd pm4-stm-docker - # - name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ env.aws-access-key-id }} - # aws-secret-access-key: ${{ env.aws-secret-access-key }} - # aws-region: ${{ env.aws-region }} - # - name: Login to Amazon ECR - # id: login-ecr - # uses: aws-actions/amazon-ecr-login@v1 - # - name: PHPUnits - # run: | - # cd pm4-stm-docker - # docker pull $IMAGE - # docker-compose down -v - # docker-compose build - # docker-compose run phpunit - job5: + job3: + name: run-phpunit + needs: job2 + runs-on: ubuntu-22.04 + steps: + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: PHPUnits + run: | + cd pm4-stm-docker + docker pull $IMAGE + docker-compose down -v + docker-compose build + docker-compose run phpunit + job4: name: run-benchmarks - needs: job3 + needs: job2 runs-on: ubuntu-22.04 steps: - name: my-step run: | echo "Fifth Step" - job6: + job5: name: run-cypress - needs: job3 + needs: job2 runs-on: ubuntu-22.04 steps: - name: my-step run: | echo "fourth Step" - job7: + job6: name: run-cypress-qa - needs: job3 + needs: job2 runs-on: ubuntu-22.04 steps: - name: my-step From 094c4b5f90e92c79f70c7c9e3b282042510ea1e5 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 31 May 2023 11:39:01 -0400 Subject: [PATCH 20/35] Validate General Params --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index ffa5111043..7ef973b2b0 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -101,7 +101,7 @@ jobs: php run.php job3: name: run-phpunit - needs: job2 + needs: job1 runs-on: ubuntu-22.04 steps: - name: Export Params From d2e59fc5c22d893917a3dae9accde4238f4801d0 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Thu, 1 Jun 2023 18:39:36 -0400 Subject: [PATCH 21/35] Validate FOUR-8780 --- .github/workflows/deploy-pm4.yml | 182 ++++++++++++++++--------------- 1 file changed, 95 insertions(+), 87 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 7ef973b2b0..2da8b1f505 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -31,43 +31,45 @@ env: CI_PROJECT: ${{github.event.pull_request.head.repo.name}} CI_TEST: $CI_PROJECT IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") + GITHUB_COMMENT: ${{ secrets.GH_COMMENT }} + pull_req_id: ${{github.event.pull_request.number}} jobs: - job1: - name: build-stm-image - runs-on: ubuntu-22.04 - steps: - - name: Export Params - run: | - echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - #Additional - echo "CI_PR_BODY=1" >> $GITHUB_ENV - echo "CACHEBUSTER=abc" >> $GITHUB_ENV - - name: Clone Repo STM - run: | - git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ env.aws-access-key-id }} - aws-secret-access-key: ${{ env.aws-secret-access-key }} - aws-region: ${{ env.aws-region }} - - name: Login to ECR - run: | - aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - - name: Build and Push the image to ECR - run: | - cd pm4-stm-docker - docker stop $(docker ps -a -q) || true - docker container prune -f - docker-compose down -v - docker-compose build processmaker - docker push ${IMAGE} + #job1: + # name: build-stm-image + # runs-on: ubuntu-22.04 + # steps: + # - name: Export Params + # run: | + # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # #Additional + # echo "CI_PR_BODY=1" >> $GITHUB_ENV + # echo "CACHEBUSTER=abc" >> $GITHUB_ENV + # - name: Clone Repo STM + # run: | + # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + # cd pm4-stm-docker + # - name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ env.aws-access-key-id }} + # aws-secret-access-key: ${{ env.aws-secret-access-key }} + # aws-region: ${{ env.aws-region }} + # - name: Login to ECR + # run: | + # aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} + # - name: Build and Push the image to ECR + # run: | + # cd pm4-stm-docker + # docker stop $(docker ps -a -q) || true + # docker container prune -f + # docker-compose down -v + # docker-compose build processmaker + # docker push ${IMAGE} job2: name: deploy-stm - needs: job1 + #needs: job1 runs-on: ubuntu-22.04 container: image: cimg/php:7.4 @@ -94,63 +96,69 @@ jobs: id: login-ecr uses: aws-actions/amazon-ecr-login@v1 - name: Deploy STM + id: stm run: | mkdir -p /tmp/workspace cd pm4-stm-docker/deploy-stm composer install --no-dev php run.php - job3: - name: run-phpunit - needs: job1 - runs-on: ubuntu-22.04 - steps: - - name: Export Params - run: | - echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - - name: Clone Repo STM + - name: Publish the URL to the Github PR + if: success() || steps.stm.conclusion == 'success' run: | - git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ env.aws-access-key-id }} - aws-secret-access-key: ${{ env.aws-secret-access-key }} - aws-region: ${{ env.aws-region }} - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - - name: PHPUnits - run: | - cd pm4-stm-docker - docker pull $IMAGE - docker-compose down -v - docker-compose build - docker-compose run phpunit - job4: - name: run-benchmarks - needs: job2 - runs-on: ubuntu-22.04 - steps: - - name: my-step - run: | - echo "Fifth Step" - job5: - name: run-cypress - needs: job2 - runs-on: ubuntu-22.04 - steps: - - name: my-step - run: | - echo "fourth Step" - job6: - name: run-cypress-qa - needs: job2 - runs-on: ubuntu-22.04 - steps: - - name: my-step - run: | - echo "Sixt Step" + cd pm4-stm-docker + bash ./github_comment.sh "$PROJECT" "$pull_req_id" + #job3: + # name: run-phpunit + # needs: job1 + # runs-on: ubuntu-22.04 + # steps: + # - name: Export Params + # run: | + # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + # - name: Clone Repo STM + # run: | + # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + # cd pm4-stm-docker + # - name: Configure AWS Credentials + # uses: aws-actions/configure-aws-credentials@v1 + # with: + # aws-access-key-id: ${{ env.aws-access-key-id }} + # aws-secret-access-key: ${{ env.aws-secret-access-key }} + # aws-region: ${{ env.aws-region }} + # - name: Login to Amazon ECR + # id: login-ecr + # uses: aws-actions/amazon-ecr-login@v1 + # - name: PHPUnits + # run: | + # cd pm4-stm-docker + # docker pull $IMAGE + # docker-compose down -v + # docker-compose build + # docker-compose run phpunit + #job4: + # name: run-benchmarks + # needs: job2 + # runs-on: ubuntu-22.04 + # steps: + # - name: my-step + # run: | + # echo "Fifth Step" + #job5: + # name: run-cypress + # needs: job2 + # runs-on: ubuntu-22.04 + # steps: + # - name: my-step + # run: | + # echo "fourth Step" + #job6: + # name: run-cypress-qa + # needs: job2 + # runs-on: ubuntu-22.04 + # steps: + # - name: my-step + # run: | + # echo "Sixt Step" From c0033cb0b5a0527390b5a98152c216eac01f4e19 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Thu, 1 Jun 2023 19:18:57 -0400 Subject: [PATCH 22/35] Validate FOUR-8780 --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 2da8b1f505..1299e6ef79 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -102,7 +102,7 @@ jobs: cd pm4-stm-docker/deploy-stm composer install --no-dev php run.php - - name: Publish the URL to the Github PR + - name: Publish the URL to the Github PR if: success() || steps.stm.conclusion == 'success' run: | cd pm4-stm-docker From 9807de77db6935011d8ed634d74ebf3fe1fa867f Mon Sep 17 00:00:00 2001 From: mavalosn Date: Thu, 1 Jun 2023 20:38:08 -0400 Subject: [PATCH 23/35] Validate FOUR-8780 --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 1299e6ef79..4d4a8d3049 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -92,7 +92,7 @@ jobs: aws-access-key-id: ${{ env.aws-access-key-id }} aws-secret-access-key: ${{ env.aws-secret-access-key }} aws-region: ${{ env.aws-region }} - - name: Login to Amazon ECR + - name: Login to Amazon ECR id: login-ecr uses: aws-actions/amazon-ecr-login@v1 - name: Deploy STM From 1a4892fbf840f63f7762fcc39b192552fc840e98 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 14 Jun 2023 11:50:45 -0400 Subject: [PATCH 24/35] Fix ticket FOUR-8781 --- .github/workflows/deploy-pm4.yml | 83 ++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 4d4a8d3049..740e9a8da9 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -33,43 +33,56 @@ env: IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") GITHUB_COMMENT: ${{ secrets.GH_COMMENT }} pull_req_id: ${{github.event.pull_request.number}} -jobs: - #job1: - # name: build-stm-image - # runs-on: ubuntu-22.04 - # steps: - # - name: Export Params - # run: | - # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # #Additional - # echo "CI_PR_BODY=1" >> $GITHUB_ENV - # echo "CACHEBUSTER=abc" >> $GITHUB_ENV - # - name: Clone Repo STM - # run: | - # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - # cd pm4-stm-docker - # - name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ env.aws-access-key-id }} - # aws-secret-access-key: ${{ env.aws-secret-access-key }} - # aws-region: ${{ env.aws-region }} - # - name: Login to ECR - # run: | - # aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - # - name: Build and Push the image to ECR - # run: | - # cd pm4-stm-docker - # docker stop $(docker ps -a -q) || true - # docker container prune -f - # docker-compose down -v - # docker-compose build processmaker - # docker push ${IMAGE} +jobs: + job0: + runs-on: ubuntu-latest + outputs: + deploy: ${{ steps.deploy_stm.outputs.run_deploy_stm }} + steps: + - id: deploy_stm + run: | + if [[ "$BODY" =~ .*"ci:deploy".* ]]; then + echo "run_deploy_stm=true" >> "$GITHUB_OUTPUT" + else + echo "run_deploy_stm=false" >> "$GITHUB_OUTPUT" + fi + job1: + name: build-stm-image + runs-on: ubuntu-22.04 + steps: + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + #Additional + echo "CI_PR_BODY=1" >> $GITHUB_ENV + echo "CACHEBUSTER=abc" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} + - name: Login to ECR + run: | + aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} + - name: Build and Push the image to ECR + run: | + cd pm4-stm-docker + docker stop $(docker ps -a -q) || true + docker container prune -f + docker-compose down -v + docker-compose build processmaker + docker push ${IMAGE} job2: name: deploy-stm - #needs: job1 + needs: [job1, job0] + if: needs.job0.outputs.deploy == 'true' runs-on: ubuntu-22.04 container: image: cimg/php:7.4 From 784ce2388a75af58270140ca5c6fdedb8dd3d9ca Mon Sep 17 00:00:00 2001 From: mavalosn Date: Wed, 14 Jun 2023 16:07:56 -0400 Subject: [PATCH 25/35] Fix ticket FOUR-8805 --- .github/workflows/deploy-pm4.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 740e9a8da9..167cc8f58d 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -41,7 +41,7 @@ jobs: steps: - id: deploy_stm run: | - if [[ "$BODY" =~ .*"ci:deploy".* ]]; then + if [[ "$BODY" =~ .*"ci:test-deploy".* ]]; then echo "run_deploy_stm=true" >> "$GITHUB_OUTPUT" else echo "run_deploy_stm=false" >> "$GITHUB_OUTPUT" @@ -174,4 +174,29 @@ jobs: # - name: my-step # run: | # echo "Sixt Step" + job7: + name: Delete Instance + if: github.event.action == 'closed' + runs-on: ubuntu-22.04 + container: + image: cimg/php:7.4 + options: --user root + steps: + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE_TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "STM_TOKEN=${{env.STM_TOKEN}}" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Delete Instance STM + run: | + mkdir -p /tmp/workspace + cd pm4-stm-docker/deploy-stm + composer install --no-dev + php run-delete-instance.php From 59959a0a5880557217a05df4973f12ca1f034776 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 15 Jun 2023 09:15:28 -0700 Subject: [PATCH 26/35] Update github actions --- .github/workflows/deploy-pm4.yml | 60 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 167cc8f58d..468a6b14ca 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -120,36 +120,36 @@ jobs: run: | cd pm4-stm-docker bash ./github_comment.sh "$PROJECT" "$pull_req_id" - #job3: - # name: run-phpunit - # needs: job1 - # runs-on: ubuntu-22.04 - # steps: - # - name: Export Params - # run: | - # echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV - # echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV - # - name: Clone Repo STM - # run: | - # git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - # cd pm4-stm-docker - # - name: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ env.aws-access-key-id }} - # aws-secret-access-key: ${{ env.aws-secret-access-key }} - # aws-region: ${{ env.aws-region }} - # - name: Login to Amazon ECR - # id: login-ecr - # uses: aws-actions/amazon-ecr-login@v1 - # - name: PHPUnits - # run: | - # cd pm4-stm-docker - # docker pull $IMAGE - # docker-compose down -v - # docker-compose build - # docker-compose run phpunit + job3: + name: run-phpunit + needs: job1 + runs-on: ubuntu-22.04 + steps: + - name: Export Params + run: | + echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV + echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV + - name: Clone Repo STM + run: | + git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker + cd pm4-stm-docker + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ env.aws-access-key-id }} + aws-secret-access-key: ${{ env.aws-secret-access-key }} + aws-region: ${{ env.aws-region }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: PHPUnits + run: | + cd pm4-stm-docker + docker pull $IMAGE + docker-compose down -v + docker-compose build + docker-compose run phpunit #job4: # name: run-benchmarks # needs: job2 From b6ea4fd31fb999d6a577f16111d75f41a1c35f67 Mon Sep 17 00:00:00 2001 From: mavalosn Date: Tue, 20 Jun 2023 11:54:18 -0400 Subject: [PATCH 27/35] FOUR-8595 --- .github/workflows/deploy-pm4.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 167cc8f58d..7245664394 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -11,6 +11,8 @@ on: #pull_request: # branches: # - main + workflow_dispatch: + workflow_call: env: SHA: ${{github.event.pull_request.head.sha}} PROJECT: ${{github.event.pull_request.head.repo.name}} @@ -48,6 +50,7 @@ jobs: fi job1: name: build-stm-image + needs: job0 runs-on: ubuntu-22.04 steps: - name: Export Params From b79acaf4e4ec0d78c38688cf801eb2c9bed1741e Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Tue, 20 Jun 2023 11:25:31 -0700 Subject: [PATCH 28/35] Remove ci:deploy tag checl. Its now in pm4-stm-docker --- .github/workflows/deploy-pm4.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index b51054db4b..8733b4bfbb 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -36,21 +36,8 @@ env: GITHUB_COMMENT: ${{ secrets.GH_COMMENT }} pull_req_id: ${{github.event.pull_request.number}} jobs: - job0: - runs-on: ubuntu-latest - outputs: - deploy: ${{ steps.deploy_stm.outputs.run_deploy_stm }} - steps: - - id: deploy_stm - run: | - if [[ "$BODY" =~ .*"ci:test-deploy".* ]]; then - echo "run_deploy_stm=true" >> "$GITHUB_OUTPUT" - else - echo "run_deploy_stm=false" >> "$GITHUB_OUTPUT" - fi job1: name: build-stm-image - needs: job0 runs-on: ubuntu-22.04 steps: - name: Export Params @@ -84,8 +71,7 @@ jobs: docker push ${IMAGE} job2: name: deploy-stm - needs: [job1, job0] - if: needs.job0.outputs.deploy == 'true' + needs: job1 runs-on: ubuntu-22.04 container: image: cimg/php:7.4 From 73550a2fa47728fcb457d8ecdd758e7effb6dc60 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Tue, 20 Jun 2023 16:29:56 -0700 Subject: [PATCH 29/35] Try layer caching --- .github/workflows/deploy-pm4.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 8733b4bfbb..bc27ffef7e 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -61,6 +61,7 @@ jobs: - name: Login to ECR run: | aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} + - uses: satackey/action-docker-layer-caching@v0.0.11 - name: Build and Push the image to ECR run: | cd pm4-stm-docker @@ -132,6 +133,7 @@ jobs: - name: Login to Amazon ECR id: login-ecr uses: aws-actions/amazon-ecr-login@v1 + - uses: satackey/action-docker-layer-caching@v0.0.11 - name: PHPUnits run: | cd pm4-stm-docker From 21858b1a82a4a02269b0f64b3ae7a4b5f9ccb835 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Tue, 20 Jun 2023 16:40:21 -0700 Subject: [PATCH 30/35] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index bc27ffef7e..0c869c485e 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -62,6 +62,7 @@ jobs: run: | aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - uses: satackey/action-docker-layer-caching@v0.0.11 + continue-on-error: true - name: Build and Push the image to ECR run: | cd pm4-stm-docker @@ -134,6 +135,7 @@ jobs: id: login-ecr uses: aws-actions/amazon-ecr-login@v1 - uses: satackey/action-docker-layer-caching@v0.0.11 + continue-on-error: true - name: PHPUnits run: | cd pm4-stm-docker From 183df4f37c9fe52388a39ea8312746f3339d437c Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 22 Jun 2023 10:02:56 -0700 Subject: [PATCH 31/35] Remove docker layer caching --- .github/workflows/deploy-pm4.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 0c869c485e..8733b4bfbb 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -61,8 +61,6 @@ jobs: - name: Login to ECR run: | aws ecr get-login-password | docker login --username AWS --password-stdin ${{env.aws-url}} - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - name: Build and Push the image to ECR run: | cd pm4-stm-docker @@ -134,8 +132,6 @@ jobs: - name: Login to Amazon ECR id: login-ecr uses: aws-actions/amazon-ecr-login@v1 - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - name: PHPUnits run: | cd pm4-stm-docker From c9d22151570909f1dc2d70650267de2a8001e6a2 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 22 Jun 2023 17:09:10 -0700 Subject: [PATCH 32/35] Add missing service name for build --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 8733b4bfbb..a5d3be8a53 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -137,7 +137,7 @@ jobs: cd pm4-stm-docker docker pull $IMAGE docker-compose down -v - docker-compose build + docker-compose build phpunit docker-compose run phpunit #job4: # name: run-benchmarks From 40337957373ae50aab7c85f670b45c88976bc6a8 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 23 Jun 2023 12:24:56 -0700 Subject: [PATCH 33/35] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index a5d3be8a53..a6959622c7 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -103,7 +103,8 @@ jobs: mkdir -p /tmp/workspace cd pm4-stm-docker/deploy-stm composer install --no-dev - php run.php + INSTANCE_URL=$(php run.php) + echo "INSTANCE_URL=${INSTANCE_URL}" >> "$GITHUB_ENV" - name: Publish the URL to the Github PR if: success() || steps.stm.conclusion == 'success' run: | From 33ec1b1986abb102777ec85b7a6f5a200cb3cd42 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 23 Jun 2023 13:14:34 -0700 Subject: [PATCH 34/35] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index a6959622c7..6890aa7944 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -104,11 +104,13 @@ jobs: cd pm4-stm-docker/deploy-stm composer install --no-dev INSTANCE_URL=$(php run.php) + echo "Instance URL: '${INSTANCE_URL}'" echo "INSTANCE_URL=${INSTANCE_URL}" >> "$GITHUB_ENV" - name: Publish the URL to the Github PR if: success() || steps.stm.conclusion == 'success' run: | cd pm4-stm-docker + echo "Instance URL: '${INSTANCE_URL}'" bash ./github_comment.sh "$PROJECT" "$pull_req_id" job3: name: run-phpunit From 0f0f1f5c83ddfcdc3bbe446d7ad7927b4e64527c Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 23 Jun 2023 14:26:49 -0700 Subject: [PATCH 35/35] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 6890aa7944..7e54343201 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -103,7 +103,10 @@ jobs: mkdir -p /tmp/workspace cd pm4-stm-docker/deploy-stm composer install --no-dev - INSTANCE_URL=$(php run.php) + php run.php + if [ -f "url.txt" ]; then + INSTANCE_URL=$(cat url.txt) + fi echo "Instance URL: '${INSTANCE_URL}'" echo "INSTANCE_URL=${INSTANCE_URL}" >> "$GITHUB_ENV" - name: Publish the URL to the Github PR