From 968381ed707fd2c112fe8e569db72ded17d5af1e Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 12:52:36 +0200 Subject: [PATCH 01/17] cicd: workflow_dispatch: #TASK-5092 --- .github/workflows/pull-request-merge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 185110ca16e..7d6fcb8818f 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -7,12 +7,13 @@ on: - "release-*" types: - closed + workflow_dispatch: jobs: build: uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x with: - maven_opts: -Dopencga.war.name=opencga -Dcheckstyle.skip + maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' delete-docker: uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x From 0049ae6476ee22b7f03e1a9ba1de45be2c9fc6b0 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 16:17:28 +0200 Subject: [PATCH 02/17] client: Regenerate autogenerated code for release 2.8.4 Xetabase 1.6.5 --- .github/workflows/pull-request-merge.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 7d6fcb8818f..64287bc02f6 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -11,13 +11,19 @@ on: jobs: build: - uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x - with: - maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' + name: Delete docker + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: '0' + - name: Build opencga + uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x + with: + maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' + - name: Delete docker + uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x + with: + cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} + secrets: inherit - delete-docker: - uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x - needs: build - with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} - secrets: inherit From d42cd6aee6b90f82487a593cb6e451c8bfcb611c Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 16:22:26 +0200 Subject: [PATCH 03/17] client: Regenerate autogenerated code for release 2.8.4 Xetabase 1.6.5 --- .github/workflows/pull-request-merge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 64287bc02f6..f13b7c9de70 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -14,7 +14,8 @@ jobs: name: Delete docker runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - name: checkout opencga + uses: actions/checkout@v3 with: fetch-depth: '0' - name: Build opencga From 11a7c9d30515db218e3a34c0696ebca47e5fa87b Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 17:45:03 +0200 Subject: [PATCH 04/17] cicd: undo step by step #TASK-5092 --- .github/workflows/pull-request-merge.yml | 25 +++++++++--------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index f13b7c9de70..7d6fcb8818f 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -11,20 +11,13 @@ on: jobs: build: - name: Delete docker - runs-on: ubuntu-22.04 - steps: - - name: checkout opencga - uses: actions/checkout@v3 - with: - fetch-depth: '0' - - name: Build opencga - uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x - with: - maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' - - name: Delete docker - uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x - with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} - secrets: inherit + uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x + with: + maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' + delete-docker: + uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x + needs: build + with: + cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} + secrets: inherit From 75133993fa884deaa2a30ffcd1374112a431ff8f Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 18:32:41 +0200 Subject: [PATCH 05/17] cicd: undo step by step #TASK-5092 --- .github/workflows/pull-request-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 7d6fcb8818f..fd33debe8fd 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -16,7 +16,7 @@ jobs: maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' delete-docker: - uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x + uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x needs: build with: cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} From 146499fb39f9586b212bfdbfce56c1287102f888 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 22:52:52 +0200 Subject: [PATCH 06/17] cicd: github.ref_name #TASK-5092 --- .github/workflows/pull-request-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index fd33debe8fd..92316819754 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -19,5 +19,5 @@ jobs: uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x needs: build with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} + cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} secrets: inherit From 4220c82670cbe1ddea6501e67ffbccbacb1da5ee Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 22:54:49 +0200 Subject: [PATCH 07/17] cicd: simplify build #TASK-5092 --- .github/workflows/pull-request-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 92316819754..4612e45c837 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -13,7 +13,7 @@ jobs: build: uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x with: - maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6' + maven_opts: -Dopencga.war.name=opencga -Dcheckstyle.skip delete-docker: uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x From cb7bff1424115180234c91cd73904dbdfe1a9f80 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 10:38:34 +0200 Subject: [PATCH 08/17] cicd: simplify build #TASK-5092 --- .github/workflows/pull-request-merge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 4612e45c837..fe5f0e6c16f 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -20,4 +20,6 @@ jobs: needs: build with: cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} - secrets: inherit + secrets: + username: ${{ secrets.DOCKER_HUB_USER }} + password: ${{ secrets.DOCKER_HUB_PASSWORD }} From 5003c438e2dcc6a172f116c367300359e7af6e58 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 10:40:44 +0200 Subject: [PATCH 09/17] cicd: simplify build #TASK-5092 --- .github/workflows/pull-request-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index fe5f0e6c16f..a18a7107f93 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -7,7 +7,9 @@ on: - "release-*" types: - closed - workflow_dispatch: + push: + branches: + - TASK-* jobs: build: @@ -20,6 +22,4 @@ jobs: needs: build with: cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} - secrets: - username: ${{ secrets.DOCKER_HUB_USER }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} + secrets: inherit From e01b7ffd2fae668ca7d16fa49606c60b488b92e2 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 11:34:17 +0200 Subject: [PATCH 10/17] cicd: added credentials to CLI #TASK-5092 --- .github/workflows/pull-request-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index a18a7107f93..7d9ce1a5879 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -21,5 +21,5 @@ jobs: uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x needs: build with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} + cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username "${{ secrets.DOCKER_HUB_USER }}" --password ${{ secrets.DOCKER_HUB_PASSWORD }} secrets: inherit From b282cd8aaf24987126638833f66a560568480bfe Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 11:38:36 +0200 Subject: [PATCH 11/17] cicd: added credentials to CLI #TASK-5092 --- .github/workflows/pull-request-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 7d9ce1a5879..ef13a61d9d2 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -21,5 +21,5 @@ jobs: uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x needs: build with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username "${{ secrets.DOCKER_HUB_USER }}" --password ${{ secrets.DOCKER_HUB_PASSWORD }} + cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} secrets: inherit From a39f410ad83efbf34d2e80aa432eca43bb37c2ff Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 11:48:06 +0200 Subject: [PATCH 12/17] cicd: added credentials to CLI #TASK-5092 --- .github/workflows/pull-request-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index ef13a61d9d2..4d011d27fd6 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -21,5 +21,5 @@ jobs: uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x needs: build with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} + cli: "python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }}" secrets: inherit From 67d4e3db158942989e1d950626c35d53378a6624 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 11:53:31 +0200 Subject: [PATCH 13/17] cicd: added credentials to CLI #TASK-5092 --- .github/workflows/pull-request-merge.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 4d011d27fd6..8cebdf8272d 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -7,9 +7,19 @@ on: - "release-*" types: - closed + secrets: + DOCKER_HUB_USER: + required: true + DOCKER_HUB_PASSWORD: + required: true push: branches: - TASK-* + secrets: + DOCKER_HUB_USER: + required: true + DOCKER_HUB_PASSWORD: + required: true jobs: build: @@ -21,5 +31,5 @@ jobs: uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x needs: build with: - cli: "python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }}" + cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} secrets: inherit From 47a4c4944b36924bc82594f61f2f1ea33c94fd9c Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 12:40:30 +0200 Subject: [PATCH 14/17] cicd: remove parameter credentials to CLI #TASK-5092 --- .github/workflows/pull-request-merge.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 8cebdf8272d..ef13a61d9d2 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -7,19 +7,9 @@ on: - "release-*" types: - closed - secrets: - DOCKER_HUB_USER: - required: true - DOCKER_HUB_PASSWORD: - required: true push: branches: - TASK-* - secrets: - DOCKER_HUB_USER: - required: true - DOCKER_HUB_PASSWORD: - required: true jobs: build: From 16e76568899830c9a605c0a7972047d6de047aac Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 5 Oct 2023 13:03:40 +0200 Subject: [PATCH 15/17] cicd: add checkout and remove build #TASK-5092 --- .github/workflows/pull-request-merge.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index ef13a61d9d2..ad80cf1eba8 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -12,14 +12,11 @@ on: - TASK-* jobs: - build: - uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x - with: - maven_opts: -Dopencga.war.name=opencga -Dcheckstyle.skip - - delete-docker: - uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@release-4.8.x - needs: build - with: - cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} + docker-delete: + name: Delete TASK docker image + runs-on: ubuntu-22.04 + steps: + - name: "Checkout opencga" + uses: actions/checkout@v2 + - run: python3 ./opencga-app/app/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} secrets: inherit From 9d056c90efd741df8031cd10e2fb8af3a00e9c7e Mon Sep 17 00:00:00 2001 From: imedina Date: Thu, 5 Oct 2023 12:07:12 +0100 Subject: [PATCH 16/17] cicd: remove inherit --- .github/workflows/pull-request-merge.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index ad80cf1eba8..5da76d0492e 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -17,6 +17,5 @@ jobs: runs-on: ubuntu-22.04 steps: - name: "Checkout opencga" - uses: actions/checkout@v2 + uses: actions/checkout@v3 - run: python3 ./opencga-app/app/cloud/docker/docker-build.py delete --images base --tag ${{ github.ref_name }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} - secrets: inherit From 27253e648f4980502727104fdc205175471c95a9 Mon Sep 17 00:00:00 2001 From: imedina Date: Thu, 5 Oct 2023 12:08:50 +0100 Subject: [PATCH 17/17] cicd: remove event --- .github/workflows/pull-request-merge.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 5da76d0492e..31b98d5afc1 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -7,13 +7,10 @@ on: - "release-*" types: - closed - push: - branches: - - TASK-* jobs: docker-delete: - name: Delete TASK docker image + name: Delete TASK Docker image runs-on: ubuntu-22.04 steps: - name: "Checkout opencga"