cicd: Update references to nez zetta deploy docker workflow #TASK-7461

Author: juanfeSanahuja

.github/workflows/check-junit-test.yml

@@ -32,18 +32,22 @@ on:
           - "opencga-storage"
           - "opencga-test"
       short_tests:
+        description: 'Run short tests.'
         type: boolean
         required: false
         default: true
       medium_tests:
+        description: 'Run medium tests.'
         type: boolean
         required: false
         default: false
       long_tests:
+        description: 'Run long tests.'
         type: boolean
         required: false
         default: false
       mvn_opts:
+        description: 'Maven options.'
         type: string
         required: false
         default: ""

.github/workflows/develop.yml

@@ -20,16 +20,16 @@ jobs:
       maven_opts: -P hdp3.1 -Dopencga.war.name=opencga
     secrets: inherit
 
-  deploy-docker:
-    uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
+  deploy-zetta-docker:
+    uses: opencb/java-common-libs/.github/workflows/deploy-zetta-docker-hub-workflow.yml@develop
     needs: build
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --org zettagenomics
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base --tag ${{ github.ref_name }}
     secrets: inherit
 
   deploy-docker-workflow:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images workflow --tag ${{ github.ref_name }} --org opencb
+      cli: python3 ./build/cloud/docker/docker-build.py push --images workflow --tag ${{ github.ref_name }}
     secrets: inherit

.github/workflows/manual-deploy-docker.yml

@@ -51,17 +51,16 @@ jobs:
           name: build-folder
           path: build
 
-  deploy-docker:
-    uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
+  deploy-zetta-docker:
+    uses: opencb/java-common-libs/.github/workflows/deploy-zetta-docker-hub-workflow.yml@develop
     needs: build
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag ${{ inputs.tag }} --org zettagenomics
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base --tag ${{ github.ref_name }}
     secrets: inherit
 
-
   deploy-docker-workflow:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images workflow --tag ${{ github.ref_name }} --org opencb
+      cli: python3 ./build/cloud/docker/docker-build.py push --images workflow --tag ${{ github.ref_name }}
     secrets: inherit

.github/workflows/manual-deploy-ext-tools.yml

@@ -50,5 +50,5 @@ jobs:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images ext-tools --tag ${{ inputs.tag }} --org opencb
+      cli: python3 ./build/cloud/docker/docker-build.py push --images ext-tools --tag ${{ inputs.tag }}
     secrets: inherit

.github/workflows/release.yml

@@ -15,12 +15,20 @@ jobs:
       build_folder: build-folder
 
   # Add the deploy-docker-hdp job that depends on the build-hdp job
-  deploy-docker-hdp:
+  deploy-zetta-docker:
+    uses: opencb/java-common-libs/.github/workflows/deploy-zetta-docker-hub-workflow.yml@develop
+    needs: build-hdp
+    with:
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base --tag "${{ needs.build-hdp.outputs.version }}-hdp3.1"
+      artifact: build-folder
+    secrets: inherit
+
+  deploy-docker-workflow:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build-hdp
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag "${{ needs.build-hdp.outputs.version }}-hdp3.1" --org zettagenomics
-      build_folder: build-folder
+      cli: python3 ./build/cloud/docker/docker-build.py push --images workflow --tag "${{ needs.build-hdp.outputs.version }}"
+      artifact: build-folder
     secrets: inherit
 
   # Add the deploy-maven and deploy-python jobs they depend on the build-hdp job
@@ -102,9 +110,3 @@ jobs:
       build_folder: build-folder-emr613
     secrets: inherit
 
-  deploy-docker-workflow:
-    uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
-    needs: build-hdp
-    with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images workflow --tag ${{ github.ref_name }} --org opencb
-    secrets: inherit

.github/workflows/reusable-delete-docker.yml

@@ -13,7 +13,7 @@ on:
         required: true
 
 jobs:
-  delete-docker:
+  delete-zetta-docker:
     name: Execute delete docker image
     runs-on: ubuntu-22.04
     steps:
@@ -23,11 +23,31 @@ jobs:
       - name: Validate task name
         if: ${{ !startsWith(inputs.task, 'TASK') }}
         run: |
-          echo "Error: Can't delete ${{ inputs.task }}. Only Docker images related to TASK branches can be deleted"
-          exit 1
+          echo "Warning: Zettagenomics DockerHub Can't delete ${{ inputs.task }}. Only Docker images related to TASK branches can be deleted"  
+          echo "Warning: Zettagenomics DockerHub Can't delete ${{ inputs.task }}. Only Docker images related to TASK branches can be deleted"  | tee -a $GITHUB_STEP_SUMMARY
+          exit 0
+      - name: Delete in Docker Hub
+        if: ${{ startsWith(inputs.task, 'TASK') }}
+        run: |
+          echo "Deleting docker image ${{ inputs.task }}"
+          python3 ./opencga-app/app/cloud/docker/docker-build.py delete --images base --tag ${{ inputs.task }} --username ${{ secrets.ZETTA_DOCKER_HUB_USER }} --password ${{ secrets.ZETTA_DOCKER_HUB_PASSWORD }} --org zettagenomics
+          
+
+  delete-opencb-docker:
+    name: Execute delete docker image
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '10'
+      - name: Validate task name
+        if: ${{ !startsWith(inputs.task, 'TASK') }}
+        run: |
+          echo "Warning: Opencb DockerHub Can't delete ${{ inputs.task }}. Only Docker images related to TASK branches can be deleted" 
+          echo "Warning: Opencb DockerHub Can't delete ${{ inputs.task }}. Only Docker images related to TASK branches can be deleted"  | tee -a $GITHUB_STEP_SUMMARY
+          exit 0
       - name: Delete in Docker Hub
         if: ${{ startsWith(inputs.task, 'TASK') }}
         run: |
           echo "Deleting docker image ${{ inputs.task }}"
-          python3 ./opencga-app/app/cloud/docker/docker-build.py delete --images base --tag ${{ inputs.task }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} --org zettagenomics
           python3 ./opencga-app/app/cloud/docker/docker-build.py delete --images workflow --tag ${{ inputs.task }} --username ${{ secrets.DOCKER_HUB_USER }} --password ${{ secrets.DOCKER_HUB_PASSWORD }} --org opencb