Merge branch 'master' into feat/GPE-1219

uc-cdis · Dec 6, 2024 · de7a294 · de7a294
2 parents 620d01c + f8c5065
commit de7a294
Show file tree

Hide file tree

Showing 19 changed files with 229 additions and 380 deletions.
diff --git a/.github/workflows/image_build_push_squid.yaml b/.github/workflows/image_build_push_squid.yaml
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
@@ -0,0 +1,27 @@
+name: Integration Tests
+
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  integration_tests:
+    name: Integration tests
+    uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master
+    with:
+      QUAY_REPO: "awshelper"
+    secrets:
+      CI_AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_ACCESS_KEY_ID }}
+      CI_AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}
+      JENKINS_API_TOKEN: ${{ secrets.JENKINS_API_TOKEN }}
+      QA_DASHBOARD_S3_PATH: ${{ secrets.QA_DASHBOARD_S3_PATH }}
+      CI_TEST_ORCID_USERID: ${{ secrets.CI_TEST_ORCID_USERID }}
+      CI_TEST_ORCID_PASSWORD: ${{ secrets.CI_TEST_ORCID_PASSWORD }}
+      CI_TEST_RAS_USERID: ${{ secrets.CI_TEST_RAS_USERID }}
+      CI_TEST_RAS_PASSWORD: ${{ secrets.CI_TEST_RAS_PASSWORD }}
+      CI_TEST_RAS_2_USERID: ${{ secrets.CI_TEST_RAS_2_USERID }}
+      CI_TEST_RAS_2_PASSWORD: ${{ secrets.CI_TEST_RAS_2_PASSWORD }}
+      CI_SLACK_BOT_TOKEN: ${{ secrets.CI_SLACK_BOT_TOKEN }}
+      CI_SLACK_CHANNEL_ID: ${{ secrets.CI_SLACK_CHANNEL_ID }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 Chef/nodes/
 tf_files/*output/*
 tf_files/terraform.tfstate

diff --git a/Docker/squid/Dockerfile b/Docker/squid/Dockerfile
diff --git a/Docker/squid/ERR_ACCESS_DENIED b/Docker/squid/ERR_ACCESS_DENIED
diff --git a/Docker/squid/certfix.sh b/Docker/squid/certfix.sh
diff --git a/Docker/squid/entrypoint.sh b/Docker/squid/entrypoint.sh