From 93b3d1bc9740e6b9aa4f19d1445c217daa736566 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 10 Jan 2024 17:03:55 -0800 Subject: [PATCH 1/5] Enable phpunit --- .github/workflows/deploy-pm4.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 6ed37d0142..edd290853a 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -137,3 +137,33 @@ jobs: echo "Deleting Instace :: ci-$deploy" helm delete ci-$deploy kubectl delete namespace ci-$deploy-ns-pm4 + + runPhpUnit: + name: run-phpunit + if: github.event.action != 'closed' + needs: imageEKS + runs-on: ${{ vars.RUNNER }} + steps: + - name: Export Params + run: | + echo "IMAGE=${{ secrets.REGISTRY_HOST }}/processmaker/enterprise:${{env.IMAGE_TAG}}" >> $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: Login to Harbor + uses: docker/login-action@v2 + with: + registry: ${{ secrets.REGISTRY_HOST }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} + - 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 phpunit + docker-compose run phpunit From b5aaa3f4853c88966c30e620e318d7dddf028ad6 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Wed, 10 Jan 2024 17:32:01 -0800 Subject: [PATCH 2/5] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index edd290853a..61ac8d4a44 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -157,9 +157,6 @@ jobs: registry: ${{ secrets.REGISTRY_HOST }} username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_PASSWORD }} - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - name: PHPUnits run: | cd pm4-stm-docker From 9ed12ba07e233fb8a7421405725c4f800b1cda95 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 11 Jan 2024 08:10:59 -0800 Subject: [PATCH 3/5] Enable cicd phpunit --- .github/workflows/deploy-pm4.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 61ac8d4a44..a48f2443cc 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -27,7 +27,7 @@ env: GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} BUILD_BASE: ${{ (contains(github.event.pull_request.body, 'ci:build-base') || github.event_name == 'schedule') && '1' || '0' }} BASE_IMAGE: ${{ secrets.REGISTRY_HOST }}/processmaker/processmaker:base - K8S_BRANCH: develop + K8S_BRANCH: cicd-enable-phpunit concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true @@ -43,7 +43,6 @@ jobs: echo "IMAGE=${{ secrets.REGISTRY_HOST }}/processmaker/enterprise:$RESOLVED_IMAGE_TAG" >> $GITHUB_ENV - name: Clone repo K8S run: | - # TODO: Change branch when pm4 k8s distribution is released echo "IMAGE: ${{ env.IMAGE }}" git clone --depth 1 -b "$K8S_BRANCH" "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-k8s-distribution.git" pm4-k8s-distribution - name: Generate image EKS @@ -147,10 +146,10 @@ jobs: - name: Export Params run: | echo "IMAGE=${{ secrets.REGISTRY_HOST }}/processmaker/enterprise:${{env.IMAGE_TAG}}" >> $GITHUB_ENV - - name: Clone Repo STM + - name: Clone repo K8S run: | - git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker - cd pm4-stm-docker + echo "IMAGE: ${{ env.IMAGE }}" + git clone --depth 1 -b "$K8S_BRANCH" "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-k8s-distribution.git" pm4-k8s-distribution - name: Login to Harbor uses: docker/login-action@v2 with: @@ -159,8 +158,8 @@ jobs: password: ${{ secrets.REGISTRY_PASSWORD }} - name: PHPUnits run: | - cd pm4-stm-docker - docker pull $IMAGE - docker-compose down -v - docker-compose build phpunit + cd pm4-stm-docker + docker pull $IMAGE + docker-compose down -v + docker-compose build phpunit docker-compose run phpunit From 149239af6b0918adb7e497604854475712159ba4 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 11 Jan 2024 08:33:29 -0800 Subject: [PATCH 4/5] Fix folder location --- .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 a48f2443cc..0d6b8e0633 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -158,7 +158,7 @@ jobs: password: ${{ secrets.REGISTRY_PASSWORD }} - name: PHPUnits run: | - cd pm4-stm-docker + cd pm4-k8s-distribution/images/pm4-tools docker pull $IMAGE docker-compose down -v docker-compose build phpunit From 63b0a7417de2a425c3b6a032d9c02158eeb8d268 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 11 Jan 2024 11:51:01 -0800 Subject: [PATCH 5/5] Set branch back to develop now that its merged --- .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 0d6b8e0633..120686f754 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -27,7 +27,7 @@ env: GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }} BUILD_BASE: ${{ (contains(github.event.pull_request.body, 'ci:build-base') || github.event_name == 'schedule') && '1' || '0' }} BASE_IMAGE: ${{ secrets.REGISTRY_HOST }}/processmaker/processmaker:base - K8S_BRANCH: cicd-enable-phpunit + K8S_BRANCH: develop concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true