temporarily disabled MySQL+ODBC builds + many tests + stable builds

orthanc-server · Sep 13, 2024 · 9604de2 · 9604de2
1 parent 21414fb
commit 9604de2
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 120 deletions.
diff --git a/.github/workflows/build-all-dockers.yml b/.github/workflows/build-all-dockers.yml
@@ -22,39 +22,39 @@ on:
 
 
 jobs:
-  build-docker-stable:
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      runner: ${{ matrix.config.runner }}
-      runner_type: ${{ matrix.config.runnerType }}
-      platform: ${{ matrix.config.platform }}
-      stable_unstable: ${{ matrix.config.stableUnstable }}
-      current_branch_tag: ${{ inputs.current_branch_tag }}
-      is_tag: ${{ inputs.is_tag }}
-    secrets:
-      docker_hub_username: ${{ secrets.docker_hub_username }}
-      docker_hub_token: ${{ secrets.docker_hub_token }}
-      aws_access_key_id: ${{ secrets.aws_access_key_id }}
-      aws_secret_access_key: ${{ secrets.aws_secret_access_key }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-        - {
-            name: "linux/amd64",
-            platform: "linux/amd64",
-            stableUnstable: "stable",
-            runner: "ubuntu-latest",
-            runnerType: "github-hosted"
-          }
-        - {
-            name: "linux/arm64",
-            platform: "linux/arm64",
-            stableUnstable: "stable",
-            runner: "debian-arm64",
-            runnerType: "self-hosted"
-          }
+  # build-docker-stable:
+  #   uses: ./.github/workflows/build-docker.yml
+  #   with:
+  #     runner: ${{ matrix.config.runner }}
+  #     runner_type: ${{ matrix.config.runnerType }}
+  #     platform: ${{ matrix.config.platform }}
+  #     stable_unstable: ${{ matrix.config.stableUnstable }}
+  #     current_branch_tag: ${{ inputs.current_branch_tag }}
+  #     is_tag: ${{ inputs.is_tag }}
+  #   secrets:
+  #     docker_hub_username: ${{ secrets.docker_hub_username }}
+  #     docker_hub_token: ${{ secrets.docker_hub_token }}
+  #     aws_access_key_id: ${{ secrets.aws_access_key_id }}
+  #     aws_secret_access_key: ${{ secrets.aws_secret_access_key }}
+
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       config:
+  #       - {
+  #           name: "linux/amd64",
+  #           platform: "linux/amd64",
+  #           stableUnstable: "stable",
+  #           runner: "ubuntu-latest",
+  #           runnerType: "github-hosted"
+  #         }
+  #       - {
+  #           name: "linux/arm64",
+  #           platform: "linux/arm64",
+  #           stableUnstable: "stable",
+  #           runner: "debian-arm64",
+  #           runnerType: "self-hosted"
+  #         }
 
   build-docker-unstable:
     uses: ./.github/workflows/build-docker.yml
@@ -90,43 +90,43 @@ jobs:
             runnerType: "self-hosted"
           }
 
-  publish-manifest-stable:
-    runs-on: "ubuntu-latest"
-    needs: [build-docker-stable]
+  # publish-manifest-stable:
+  #   runs-on: "ubuntu-latest"
+  #   needs: [build-docker-stable]
 
-    steps:
+  #   steps:
 
-    - uses: actions/checkout@v3
+  #   - uses: actions/checkout@v3
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.docker_hub_username }}
-        password: ${{ secrets.docker_hub_token }}
+  #   - name: Login to DockerHub
+  #     uses: docker/login-action@v2
+  #     with:
+  #       username: ${{ secrets.docker_hub_username }}
+  #       password: ${{ secrets.docker_hub_token }}
 
-    - name: Publish Dockerhub manifest normal image
-      run: ./local-build.sh version=stable image=normal type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-stable pushTag=${{ inputs.current_branch_tag }} isTag=${{ inputs.is_tag }}
+  #   - name: Publish Dockerhub manifest normal image
+  #     run: ./local-build.sh version=stable image=normal type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-stable pushTag=${{ inputs.current_branch_tag }} isTag=${{ inputs.is_tag }}
 
-    - name: Publish Dockerhub manifest full image
-      run: ./local-build.sh version=stable image=full type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-full-stable pushTag=${{ inputs.current_branch_tag }}-full isTag=${{ inputs.is_tag }}
+  #   - name: Publish Dockerhub manifest full image
+  #     run: ./local-build.sh version=stable image=full type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-full-stable pushTag=${{ inputs.current_branch_tag }}-full isTag=${{ inputs.is_tag }}
 
-    - name: Publish Dockerhub manifest with latest tag for normal image
-      if: inputs.is_tag == 'true'
-      run: ./local-build.sh version=stable image=normal type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-stable pushTag=latest isTag=${{ inputs.is_tag }}
+  #   - name: Publish Dockerhub manifest with latest tag for normal image
+  #     if: inputs.is_tag == 'true'
+  #     run: ./local-build.sh version=stable image=normal type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-stable pushTag=latest isTag=${{ inputs.is_tag }}
 
-    - name: Publish Dockerhub manifest with latest tag for full image
-      if: inputs.is_tag == 'true'
-      run: ./local-build.sh version=stable image=full type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-full-stable pushTag=latest-full isTag=${{ inputs.is_tag }}
+  #   - name: Publish Dockerhub manifest with latest tag for full image
+  #     if: inputs.is_tag == 'true'
+  #     run: ./local-build.sh version=stable image=full type=ci step=publish-manifest currentTag=${{ inputs.current_branch_tag }}-full-stable pushTag=latest-full isTag=${{ inputs.is_tag }}
 
 
-    - name: Update DockerHub repo description
-      uses: peter-evans/dockerhub-description@v3
-      if: inputs.is_tag == 'true'
-      with:
-        username: ${{ secrets.docker_hub_username }}
-        password: ${{ secrets.docker_hub_token }}
-        repository: orthancteam/orthanc
-        readme-filepath: README-dockerhub.md
+  #   - name: Update DockerHub repo description
+  #     uses: peter-evans/dockerhub-description@v3
+  #     if: inputs.is_tag == 'true'
+  #     with:
+  #       username: ${{ secrets.docker_hub_username }}
+  #       password: ${{ secrets.docker_hub_token }}
+  #       repository: orthancteam/orthanc
+  #       readme-filepath: README-dockerhub.md
 
 
   publish-manifest-unstable:

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -118,14 +118,14 @@ jobs:
       run: ./run-integration-tests.sh version=${{ inputs.stable_unstable }} image=normal tagToTest=${{ inputs.current_branch_tag }}-normal-${{ inputs.stable_unstable }}
       working-directory: ${{github.workspace}}/docker/integration-tests
 
-    - name: Build full image with local-build.sh
-      run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=full type=ci step=build currentTag=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }}
+    # - name: Build full image with local-build.sh
+    #   run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=full type=ci step=build currentTag=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }}
 
-    - name: Run full image integration tests
-      # TODO: enable on ARM64 too
-      if: inputs.runner_type == 'github-hosted'
-      run: ./run-integration-tests.sh version=${{ inputs.stable_unstable }} image=full tagToTest=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }}
-      working-directory: ${{github.workspace}}/docker/integration-tests
+    # - name: Run full image integration tests
+    #   # TODO: enable on ARM64 too
+    #   if: inputs.runner_type == 'github-hosted'
+    #   run: ./run-integration-tests.sh version=${{ inputs.stable_unstable }} image=full tagToTest=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }}
+    #   working-directory: ${{github.workspace}}/docker/integration-tests
 
     # - name: Setup tmate session
     #   uses: mxschmitt/action-tmate@v3
@@ -136,16 +136,16 @@ jobs:
     - name: Push normal image with branch/tag
       run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=normal type=ci step=push currentTag=${{ inputs.current_branch_tag }}-normal-${{ inputs.stable_unstable }} pushTag=${{ inputs.current_branch_tag }} isTag=${{ inputs.is_tag }}
 
-    - name: Push full image with branch/tag
-      run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=full type=ci step=push currentTag=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }} pushTag=${{ inputs.current_branch_tag }}-full isTag=${{ inputs.is_tag }}
+    # - name: Push full image with branch/tag
+    #   run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=full type=ci step=push currentTag=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }} pushTag=${{ inputs.current_branch_tag }}-full isTag=${{ inputs.is_tag }}
 
     - name: Push normal image with latest tag
       if: inputs.is_tag == 'true'
       run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=normal type=ci step=push currentTag=${{ inputs.current_branch_tag }}-normal-${{ inputs.stable_unstable }} pushTag=latest isTag=${{ inputs.is_tag }}
 
-    - name: Push full image with latest tag
-      if: inputs.is_tag == 'true'
-      run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=full type=ci step=push currentTag=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }} pushTag=latest-full isTag=${{ inputs.is_tag }}
+    # - name: Push full image with latest tag
+    #   if: inputs.is_tag == 'true'
+    #   run: ./local-build.sh version=${{ inputs.stable_unstable }} platform=${{ inputs.platform }} image=full type=ci step=push currentTag=${{ inputs.current_branch_tag }}-full-${{ inputs.stable_unstable }} pushTag=latest-full isTag=${{ inputs.is_tag }}
 
     - name: Setup tmate session
       if: ${{ failure() && inputs.runner_type == 'github-hosted' }}

diff --git a/docker/integration-tests/run-integration-tests.sh b/docker/integration-tests/run-integration-tests.sh
@@ -134,21 +134,21 @@ if [[ $image == "normal" ]]; then
     docker build $add_host_cmd --build-arg ORTHANC_TESTS_REVISION=$orthanc_tests_revision -f orthanc-tests/Dockerfile --target orthanc-tests-tls-check-client -t orthanc-tests-tls-check-client orthanc-tests
     docker build $add_host_cmd --build-arg ORTHANC_TESTS_REVISION=$orthanc_tests_revision -f orthanc-tests/Dockerfile --target orthanc-tests-tls-check-client-generate-config -t orthanc-tests-tls-check-client-generate-config orthanc-tests
 
-    COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose down -v
-    COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose run --rm orthanc-tests-tls-no-check-client-generate-config
-    COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose up orthanc-tests-tls-no-check-client --exit-code-from orthanc-tests-tls-no-check-client --abort-on-container-exit
-    COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose down -v
+    # COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose down -v
+    # COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose run --rm orthanc-tests-tls-no-check-client-generate-config
+    # COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose up orthanc-tests-tls-no-check-client --exit-code-from orthanc-tests-tls-no-check-client --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.tls-no-check-client.yml         docker compose down -v
 
-    COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose down -v
-    COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose run --rm orthanc-tests-tls-check-client-generate-config
-    COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose up orthanc-tests-tls-check-client --exit-code-from orthanc-tests-tls-check-client --abort-on-container-exit
-    COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose down -v
+    # COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose down -v
+    # COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose run --rm orthanc-tests-tls-check-client-generate-config
+    # COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose up orthanc-tests-tls-check-client --exit-code-from orthanc-tests-tls-check-client --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.tls-check-client.yml            docker compose down -v
 
     COMPOSE_FILE=docker-compose.sqlite.yml                      docker compose down -v
     COMPOSE_FILE=docker-compose.sqlite.yml                      docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.sqlite-compression.yml          docker compose down -v
-    COMPOSE_FILE=docker-compose.sqlite-compression.yml          docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.sqlite-compression.yml          docker compose down -v
+    # COMPOSE_FILE=docker-compose.sqlite-compression.yml          docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
     COMPOSE_FILE=docker-compose.dicomweb.yml                    docker compose down -v
     COMPOSE_FILE=docker-compose.dicomweb.yml                    docker compose up --build --exit-code-from orthanc-tests-dicomweb --abort-on-container-exit
@@ -165,41 +165,41 @@ if [[ $image == "normal" ]]; then
     # TODO: add mysql-dicomweb tests
     # TODO: add sqlserver-dicomweb tests
 
-    COMPOSE_FILE=docker-compose.odbc-postgres.yml               docker compose down -v
-    COMPOSE_FILE=docker-compose.odbc-postgres.yml               docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.odbc-postgres.yml               docker compose down -v
+    # COMPOSE_FILE=docker-compose.odbc-postgres.yml               docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.odbc-sqlite.yml                 docker compose down -v
-    COMPOSE_FILE=docker-compose.odbc-sqlite.yml                 docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.odbc-sqlite.yml                 docker compose down -v
+    # COMPOSE_FILE=docker-compose.odbc-sqlite.yml                 docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.mysql.yml                       docker compose down -v
-    COMPOSE_FILE=docker-compose.mysql.yml                       docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.mysql.yml                       docker compose down -v
+    # COMPOSE_FILE=docker-compose.mysql.yml                       docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.webdav.yml                      docker compose down -v
-    COMPOSE_FILE=docker-compose.webdav.yml                      docker compose up --build --exit-code-from orthanc-tests-webdav --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.webdav.yml                      docker compose down -v
+    # COMPOSE_FILE=docker-compose.webdav.yml                      docker compose up --build --exit-code-from orthanc-tests-webdav --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.cget.yml                        docker compose down -v
-    COMPOSE_FILE=docker-compose.cget.yml                        docker compose up --build --exit-code-from orthanc-tests-cget --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.cget.yml                        docker compose down -v
+    # COMPOSE_FILE=docker-compose.cget.yml                        docker compose up --build --exit-code-from orthanc-tests-cget --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.s3.yml                         docker compose down -v
-    COMPOSE_FILE=docker-compose.s3.yml                         docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.s3.yml                         docker compose down -v
+    # COMPOSE_FILE=docker-compose.s3.yml                         docker compose up --build --exit-code-from orthanc-tests --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.wsi.yml                         docker compose down -v
-    COMPOSE_FILE=docker-compose.wsi.yml                         docker compose up --build --exit-code-from orthanc-tests-wsi --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.wsi.yml                         docker compose down -v
+    # COMPOSE_FILE=docker-compose.wsi.yml                         docker compose up --build --exit-code-from orthanc-tests-wsi --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.transfers.yml                   docker compose down -v
-    COMPOSE_FILE=docker-compose.transfers.yml                   docker compose up --build --exit-code-from orthanc-tests-transfers --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.transfers.yml                   docker compose down -v
+    # COMPOSE_FILE=docker-compose.transfers.yml                   docker compose up --build --exit-code-from orthanc-tests-transfers --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.recycling.yml                   docker compose down -v
-    COMPOSE_FILE=docker-compose.recycling.yml                   docker compose up --build --exit-code-from orthanc-tests-recycling --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.recycling.yml                   docker compose down -v
+    # COMPOSE_FILE=docker-compose.recycling.yml                   docker compose up --build --exit-code-from orthanc-tests-recycling --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.worklists.yml                   docker compose down -v
-    COMPOSE_FILE=docker-compose.worklists.yml                   docker compose up --build --exit-code-from orthanc-tests-worklists --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.worklists.yml                   docker compose down -v
+    # COMPOSE_FILE=docker-compose.worklists.yml                   docker compose up --build --exit-code-from orthanc-tests-worklists --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.ingest-transcoding.yml          docker compose down -v
-    COMPOSE_FILE=docker-compose.ingest-transcoding.yml          docker compose up --build --exit-code-from orthanc-under-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.ingest-transcoding.yml          docker compose down -v
+    # COMPOSE_FILE=docker-compose.ingest-transcoding.yml          docker compose up --build --exit-code-from orthanc-under-tests --abort-on-container-exit
 
-    COMPOSE_FILE=docker-compose.scu-transcoding.yml             docker compose down -v
-    COMPOSE_FILE=docker-compose.scu-transcoding.yml             docker compose up --build --exit-code-from orthanc-under-tests --abort-on-container-exit
+    # COMPOSE_FILE=docker-compose.scu-transcoding.yml             docker compose down -v
+    # COMPOSE_FILE=docker-compose.scu-transcoding.yml             docker compose up --build --exit-code-from orthanc-under-tests --abort-on-container-exit
 
 # note: not functional yet:
 # COMPOSE_FILE=docker-compose.odbc-mysql.yml               docker compose down -v