diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml new file mode 100644 index 000000000..41def6cdf --- /dev/null +++ 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/gen3-code-vigil/.github/workflows/shared_integration_tests.yaml@chore/manifest_pr_setup + with: + TEST_REPO_BRANCH: chore/manifest_pr_setup + 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 }} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 23005e239..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,5 +0,0 @@ -#!groovy -@Library('cdis-jenkins-lib@master') _ -testPipeline { - MANIFEST = "True" -} diff --git a/jenkins-blood.planx-pla.net/manifest.json b/jenkins-blood.planx-pla.net/manifest.json index 632772a9b..0d9ea4ccf 100644 --- a/jenkins-blood.planx-pla.net/manifest.json +++ b/jenkins-blood.planx-pla.net/manifest.json @@ -295,6 +295,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-brain.planx-pla.net/manifest.json b/jenkins-brain.planx-pla.net/manifest.json index 382f6d317..a679e458c 100644 --- a/jenkins-brain.planx-pla.net/manifest.json +++ b/jenkins-brain.planx-pla.net/manifest.json @@ -292,6 +292,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-dcp.planx-pla.net/manifest.json b/jenkins-dcp.planx-pla.net/manifest.json index 16cccaf1e..a81bd93ec 100644 --- a/jenkins-dcp.planx-pla.net/manifest.json +++ b/jenkins-dcp.planx-pla.net/manifest.json @@ -288,6 +288,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-genomel.planx-pla.net/manifest.json b/jenkins-genomel.planx-pla.net/manifest.json index e4ae98f0a..a434808c9 100644 --- a/jenkins-genomel.planx-pla.net/manifest.json +++ b/jenkins-genomel.planx-pla.net/manifest.json @@ -296,6 +296,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-new-1.planx-pla.net/manifest.json b/jenkins-new-1.planx-pla.net/manifest.json index b5fe4207b..4b189a85e 100644 --- a/jenkins-new-1.planx-pla.net/manifest.json +++ b/jenkins-new-1.planx-pla.net/manifest.json @@ -12,7 +12,7 @@ "audit-service": "quay.io/cdis/audit-service:master", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1", "awshelper": "quay.io/cdis/awshelper:master", - "fence": "quay.io/cdis/fence:master", + "fence": "quay.io/cdis/fence:2025.01", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "indexd": "quay.io/cdis/indexd:master", "ws-storage": "quay.io/cdis/ws-storage:master", @@ -286,6 +286,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-new-2.planx-pla.net/manifest.json b/jenkins-new-2.planx-pla.net/manifest.json index f879b62b6..9d03349b9 100644 --- a/jenkins-new-2.planx-pla.net/manifest.json +++ b/jenkins-new-2.planx-pla.net/manifest.json @@ -286,6 +286,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-new-3.planx-pla.net/manifest.json b/jenkins-new-3.planx-pla.net/manifest.json index 4b45e20bd..d3cd6c823 100644 --- a/jenkins-new-3.planx-pla.net/manifest.json +++ b/jenkins-new-3.planx-pla.net/manifest.json @@ -286,6 +286,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-new-4.planx-pla.net/manifest.json b/jenkins-new-4.planx-pla.net/manifest.json index ef87239f6..04327a459 100644 --- a/jenkins-new-4.planx-pla.net/manifest.json +++ b/jenkins-new-4.planx-pla.net/manifest.json @@ -286,6 +286,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-new.planx-pla.net/manifest.json b/jenkins-new.planx-pla.net/manifest.json index 5b2e8b2b7..2dc37db7e 100644 --- a/jenkins-new.planx-pla.net/manifest.json +++ b/jenkins-new.planx-pla.net/manifest.json @@ -286,6 +286,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ { diff --git a/jenkins-niaid.planx-pla.net/manifest.json b/jenkins-niaid.planx-pla.net/manifest.json index ca38b53f2..e78bee019 100644 --- a/jenkins-niaid.planx-pla.net/manifest.json +++ b/jenkins-niaid.planx-pla.net/manifest.json @@ -298,6 +298,9 @@ "canary": { "default": 0 }, + "google": { + "enabled": "yes" + }, "guppy": { "indices": [ {