Revert "temp: Skip integration test run due to time"

This reverts commit 9e35d8a.

Author: BryanFauble

.github/workflows/build.yml

@@ -161,61 +161,61 @@ jobs:
       # run integration tests on the oldest and newest supported versions of python.
       # we don't run on the entire matrix to avoid a 3xN set of concurrent tests against
       # the target server where N is the number of supported python versions.
-      # - name: run-integration-tests
-      #   shell: bash
+      - name: run-integration-tests
+        shell: bash
 
-      #   # keep versions consistent with the first and last from the strategy matrix
-      #   if: ${{ (contains(fromJSON('["3.9"]'), matrix.python) || contains(fromJSON('["3.13"]'), matrix.python)) && steps.secret-check.outputs.secrets_available == 'true'}}
-      #   run: |
-      #     # decrypt the encrypted test synapse configuration
-      #     openssl aes-256-cbc -K ${{ secrets.encrypted_d17283647768_key }} -iv ${{ secrets.encrypted_d17283647768_iv }} -in test.synapseConfig.enc -out test.synapseConfig -d
-      #     mv test.synapseConfig ~/.synapseConfig
-
-      #     if [ "${{ startsWith(matrix.os, 'ubuntu') }}" == "true" ]; then
-      #       # on linux only we can build and run a docker container to serve as an SFTP host for our SFTP tests.
-      #       # Docker is not available on GH Action runners on Mac and Windows.
-
-      #       docker build -t sftp_tests - < tests/integration/synapseclient/core/upload/Dockerfile_sftp
-      #       docker run -d sftp_tests:latest
-
-      #       # get the internal IP address of the just launched container
-      #       export SFTP_HOST=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -q))
-
-      #       printf "[sftp://$SFTP_HOST]\nusername: test\npassword: test\n" >> ~/.synapseConfig
-
-      #       # add to known_hosts so the ssh connections can be made without any prompting/errors
-      #       mkdir -p ~/.ssh
-      #       ssh-keyscan -H $SFTP_HOST >> ~/.ssh/known_hosts
-      #     fi
-
-      #       # set env vars used in external bucket tests from secrets
-      #     export EXTERNAL_S3_BUCKET_NAME="${{secrets.EXTERNAL_S3_BUCKET_NAME}}"
-      #     export EXTERNAL_S3_BUCKET_AWS_ACCESS_KEY_ID="${{secrets.EXTERNAL_S3_BUCKET_AWS_ACCESS_KEY_ID}}"
-      #     export EXTERNAL_S3_BUCKET_AWS_SECRET_ACCESS_KEY="${{secrets.EXTERNAL_S3_BUCKET_AWS_SECRET_ACCESS_KEY}}"
-      #     if [ ${{ steps.otel-check.outputs.run_opentelemetry }} == "true" ]; then
-      #       # Set to 'file' to enable OpenTelemetry export to file
-      #       export SYNAPSE_OTEL_INTEGRATION_TEST_EXPORTER="file"
-      #     fi
-
-      #     # use loadscope to avoid issues running tests concurrently that share scoped fixtures
-      #     pytest -sv --reruns 3 --cov-append --cov=. --cov-report xml tests/integration -n 8 --ignore=tests/integration/synapseclient/test_command_line_client.py --dist loadscope
-
-      #     # Execute the CLI tests in a non-dist way because they were causing some test instability when being run concurrently
-      #     pytest -sv --reruns 3 --cov-append --cov=. --cov-report xml tests/integration/synapseclient/test_command_line_client.py
-      # - name: Upload otel spans
-      #   uses: actions/upload-artifact@v4
-      #   if: always()
-      #   with:
-      #     name: otel_spans_integration_testing_${{ matrix.os }}
-      #     path: tests/integration/otel_spans_integration_testing_*.ndjson
-      #     if-no-files-found: ignore
-      # - name: Upload coverage report
-      #   id: upload_coverage_report
-      #   uses: actions/upload-artifact@v4
-      #   if: ${{ contains(fromJSON('["3.13"]'), matrix.python) && contains(fromJSON('["ubuntu-22.04"]'), matrix.os)}}
-      #   with:
-      #     name: coverage-report
-      #     path: coverage.xml
+        # keep versions consistent with the first and last from the strategy matrix
+        if: ${{ (contains(fromJSON('["3.9"]'), matrix.python) || contains(fromJSON('["3.13"]'), matrix.python)) && steps.secret-check.outputs.secrets_available == 'true'}}
+        run: |
+          # decrypt the encrypted test synapse configuration
+          openssl aes-256-cbc -K ${{ secrets.encrypted_d17283647768_key }} -iv ${{ secrets.encrypted_d17283647768_iv }} -in test.synapseConfig.enc -out test.synapseConfig -d
+          mv test.synapseConfig ~/.synapseConfig
+
+          if [ "${{ startsWith(matrix.os, 'ubuntu') }}" == "true" ]; then
+            # on linux only we can build and run a docker container to serve as an SFTP host for our SFTP tests.
+            # Docker is not available on GH Action runners on Mac and Windows.
+
+            docker build -t sftp_tests - < tests/integration/synapseclient/core/upload/Dockerfile_sftp
+            docker run -d sftp_tests:latest
+
+            # get the internal IP address of the just launched container
+            export SFTP_HOST=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -q))
+
+            printf "[sftp://$SFTP_HOST]\nusername: test\npassword: test\n" >> ~/.synapseConfig
+
+            # add to known_hosts so the ssh connections can be made without any prompting/errors
+            mkdir -p ~/.ssh
+            ssh-keyscan -H $SFTP_HOST >> ~/.ssh/known_hosts
+          fi
+
+            # set env vars used in external bucket tests from secrets
+          export EXTERNAL_S3_BUCKET_NAME="${{secrets.EXTERNAL_S3_BUCKET_NAME}}"
+          export EXTERNAL_S3_BUCKET_AWS_ACCESS_KEY_ID="${{secrets.EXTERNAL_S3_BUCKET_AWS_ACCESS_KEY_ID}}"
+          export EXTERNAL_S3_BUCKET_AWS_SECRET_ACCESS_KEY="${{secrets.EXTERNAL_S3_BUCKET_AWS_SECRET_ACCESS_KEY}}"
+          if [ ${{ steps.otel-check.outputs.run_opentelemetry }} == "true" ]; then
+            # Set to 'file' to enable OpenTelemetry export to file
+            export SYNAPSE_OTEL_INTEGRATION_TEST_EXPORTER="file"
+          fi
+
+          # use loadscope to avoid issues running tests concurrently that share scoped fixtures
+          pytest -sv --reruns 3 --cov-append --cov=. --cov-report xml tests/integration -n 8 --ignore=tests/integration/synapseclient/test_command_line_client.py --dist loadscope
+
+          # Execute the CLI tests in a non-dist way because they were causing some test instability when being run concurrently
+          pytest -sv --reruns 3 --cov-append --cov=. --cov-report xml tests/integration/synapseclient/test_command_line_client.py
+      - name: Upload otel spans
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: otel_spans_integration_testing_${{ matrix.os }}
+          path: tests/integration/otel_spans_integration_testing_*.ndjson
+          if-no-files-found: ignore
+      - name: Upload coverage report
+        id: upload_coverage_report
+        uses: actions/upload-artifact@v4
+        if: ${{ contains(fromJSON('["3.13"]'), matrix.python) && contains(fromJSON('["ubuntu-22.04"]'), matrix.os)}}
+        with:
+          name: coverage-report
+          path: coverage.xml
 
   sonarcloud:
     needs: [test]