From 471dcb03edaa114c4b7f5c1f2053962a79bbb859 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 16:53:26 +0300 Subject: [PATCH 01/12] add jenkins name input --- .github/workflows/build-app-service-image.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 1ef5846..0080686 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -21,6 +21,10 @@ on: service_name: type: string required: true + jenkins_name: + type: string + required: false + default: ${{inputs.service_name}} env: ## Sets environment variable NPM_TOKEN: ${{ secrets.NPM_TOKEN }} @@ -58,6 +62,6 @@ jobs: jobBuildUrl: https://jenkins.totango.com/job/kube_deploy_tool/buildWithParameters parameters: | Action=deploy - Components=${{ inputs.service_name }} + Components=${{ inputs.jenkins_name }} Environment=test Custom_Version=${{steps.image.outputs.version}} From ec2babc8e67d6b0af3707bf65acb39d325af55b4 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:01:06 +0300 Subject: [PATCH 02/12] add echo --- .github/workflows/build-app-service-image.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 0080686..5d99ccd 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -40,6 +40,11 @@ jobs: uses: actions/checkout@v3 with: persist-credentials: false + - name: echo stuff + shell: bash + run: | + echo ${{inputs.service_name}} + echo ${{inputs.jenkins_name}} - name: setup node uses: actions/setup-node@master with: @@ -53,7 +58,7 @@ jobs: service_name: ${{ inputs.service_name }} npm_token: ${{secrets.NPM_TOKEN}} - name: Deploy new version - if: steps.image.outputs.branch == 'develop' + if: steps.image.outputs.branch !== 'develop' uses: leanix/jenkins-action@master env: JENKINS_USER: ${{ secrets.JENKINS_USER }} From cc0cd9e6e74b63266773201e06347f43b2ccef26 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:20:21 +0300 Subject: [PATCH 03/12] add local log to test run --- .github/workflows/node-testing-workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-testing-workflow.yaml b/.github/workflows/node-testing-workflow.yaml index 3b104f1..3d2ca4f 100644 --- a/.github/workflows/node-testing-workflow.yaml +++ b/.github/workflows/node-testing-workflow.yaml @@ -53,4 +53,4 @@ jobs: env: REDIS_URL: 'redis' run: | - npm run test \ No newline at end of file + env IS_LOCAL_LOG=true npm run test \ No newline at end of file From 1dcbdf7d88785b478a4865b1f746d5d3fc6296a5 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:22:22 +0300 Subject: [PATCH 04/12] fix --- .github/workflows/build-app-service-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 5d99ccd..7ae43a9 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -58,7 +58,7 @@ jobs: service_name: ${{ inputs.service_name }} npm_token: ${{secrets.NPM_TOKEN}} - name: Deploy new version - if: steps.image.outputs.branch !== 'develop' + if: steps.image.outputs.branch == 'develop' uses: leanix/jenkins-action@master env: JENKINS_USER: ${{ secrets.JENKINS_USER }} From 1f375a5ad0812050c379fa05a31f71fc489ac10a Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:26:16 +0300 Subject: [PATCH 05/12] try here --- .github/workflows/build-app-service-image.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 7ae43a9..14dc731 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -40,10 +40,13 @@ jobs: uses: actions/checkout@v3 with: persist-credentials: false - - name: echo stuff + - name: echo service_name + shell: bash + run: | + echo ${{inputs.jenkins_name}} + - name: echo jenkins_name shell: bash run: | - echo ${{inputs.service_name}} echo ${{inputs.jenkins_name}} - name: setup node uses: actions/setup-node@master From 7576e81dd3881315ffb5eb57ac5bec60ba2179e2 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:39:35 +0300 Subject: [PATCH 06/12] try this job --- .github/workflows/build-app-service-image.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 14dc731..f7fa3a3 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -24,7 +24,7 @@ on: jenkins_name: type: string required: false - default: ${{inputs.service_name}} + env: ## Sets environment variable NPM_TOKEN: ${{ secrets.NPM_TOKEN }} @@ -40,14 +40,11 @@ jobs: uses: actions/checkout@v3 with: persist-credentials: false - - name: echo service_name - shell: bash - run: | - echo ${{inputs.jenkins_name}} - - name: echo jenkins_name + - name: get jenkins_name + id: get_jenkins_name shell: bash run: | - echo ${{inputs.jenkins_name}} + echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo ${{ inputs.service_name }}; else echo ${{ inputs.jenkins_name }}; fi)" - name: setup node uses: actions/setup-node@master with: @@ -70,6 +67,6 @@ jobs: jobBuildUrl: https://jenkins.totango.com/job/kube_deploy_tool/buildWithParameters parameters: | Action=deploy - Components=${{ inputs.jenkins_name }} + Components=${{ steps.get_jenkins_name.service_jenkins_name }} Environment=test Custom_Version=${{steps.image.outputs.version}} From 07c59ddaece9383aa0fb880f6cca8e49ddfd18b1 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:42:05 +0300 Subject: [PATCH 07/12] ok do this --- .github/workflows/build-app-service-image.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index f7fa3a3..bf6d3c6 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -45,6 +45,10 @@ jobs: shell: bash run: | echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo ${{ inputs.service_name }}; else echo ${{ inputs.jenkins_name }}; fi)" + - name: echo jenkins name + shell: bash + run: | + echo ${{ steps.get_jenkins_name.outputs.service_jenkins_name }} - name: setup node uses: actions/setup-node@master with: @@ -67,6 +71,6 @@ jobs: jobBuildUrl: https://jenkins.totango.com/job/kube_deploy_tool/buildWithParameters parameters: | Action=deploy - Components=${{ steps.get_jenkins_name.service_jenkins_name }} + Components=${{ steps.get_jenkins_name.outputs.service_jenkins_name }} Environment=test Custom_Version=${{steps.image.outputs.version}} From b035deec6a2a48a6db52073c27d37e138cfcb4d9 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:46:05 +0300 Subject: [PATCH 08/12] asd --- .github/workflows/build-app-service-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index bf6d3c6..b5491b7 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -44,7 +44,7 @@ jobs: id: get_jenkins_name shell: bash run: | - echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo ${{ inputs.service_name }}; else echo ${{ inputs.jenkins_name }}; fi)" + echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo "${{ inputs.service_name }}"; else echo "${{ inputs.jenkins_name }}"; fi)" - name: echo jenkins name shell: bash run: | From eb9bbf1b8ceabcd2cc684fe1d75b7e24baa775d6 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:51:32 +0300 Subject: [PATCH 09/12] asd --- .github/workflows/build-app-service-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index b5491b7..56681bb 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -44,7 +44,7 @@ jobs: id: get_jenkins_name shell: bash run: | - echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo "${{ inputs.service_name }}"; else echo "${{ inputs.jenkins_name }}"; fi)" + echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo "no jenkins name"; else echo "i have a jenkins name"; fi)" - name: echo jenkins name shell: bash run: | From 8473f544dea2e8657a5c8838c8ddcefa4a810e29 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 17:56:14 +0300 Subject: [PATCH 10/12] asd --- .github/workflows/build-app-service-image.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 56681bb..b734c8a 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -24,6 +24,7 @@ on: jenkins_name: type: string required: false + default: "" env: ## Sets environment variable From 7c7f121763e2b9a4b0fa7ed78e245ed3ea3fd4bd Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 18:02:27 +0300 Subject: [PATCH 11/12] dsa --- .github/workflows/build-app-service-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index b734c8a..694757d 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -45,7 +45,7 @@ jobs: id: get_jenkins_name shell: bash run: | - echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} = '' ]; then echo "no jenkins name"; else echo "i have a jenkins name"; fi)" + echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} != '' ]; then echo "i have jenkins name"; else echo "no jenkins name"; fi)" - name: echo jenkins name shell: bash run: | From 99b0fabc23f7f911db62bd7012697fd91ad13e65 Mon Sep 17 00:00:00 2001 From: dav-sap Date: Tue, 21 Jun 2022 18:09:16 +0300 Subject: [PATCH 12/12] asd --- .github/workflows/build-app-service-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-app-service-image.yaml b/.github/workflows/build-app-service-image.yaml index 694757d..1d7edcc 100644 --- a/.github/workflows/build-app-service-image.yaml +++ b/.github/workflows/build-app-service-image.yaml @@ -45,7 +45,7 @@ jobs: id: get_jenkins_name shell: bash run: | - echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} != '' ]; then echo "i have jenkins name"; else echo "no jenkins name"; fi)" + echo "::set-output name=service_jenkins_name::$(if [ ${{ inputs.jenkins_name }} != '' ]; then echo "${{ inputs.jenkins_name }}"; else echo "${{ inputs.service_name }}"; fi)" - name: echo jenkins name shell: bash run: |