From 4ade52d46de1828c47d18aade92a48188ce63e46 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal Date: Wed, 19 Feb 2025 10:31:31 -0600 Subject: [PATCH 1/5] Don't Merge - Testing Only --- .github/labeler.yml | 2 -- .github/workflows/integration_tests.yaml | 27 +++++++++++++++++++ .github/workflows/labeler.yml | 12 --------- Jenkinsfile | 5 ---- .../manifest.json | 2 +- 5 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 .github/labeler.yml create mode 100644 .github/workflows/integration_tests.yaml delete mode 100644 .github/workflows/labeler.yml delete mode 100644 Jenkinsfile diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index 1cc8f7cca9..0000000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,2 +0,0 @@ -test-portal-dataguidOrgTest: -- any: ['dataguids.org/**/*'] diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml new file mode 100644 index 0000000000..2044d48eb5 --- /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: + SERVICE_TO_TEST: graph_submission + 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/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index 3ac45ccef4..0000000000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: "Pull Request Labeler" -on: -- pull_request_target - -jobs: - triage: - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@v3 - with: - repo-token: "${{ secrets.GEN3_RELEASE_GH_TOKEN }}" - \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 23005e239a..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,5 +0,0 @@ -#!groovy -@Library('cdis-jenkins-lib@master') _ -testPipeline { - MANIFEST = "True" -} diff --git a/gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json b/gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json index f284dfebc7..098c28b0ae 100644 --- a/gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json +++ b/gen3.biodatacatalyst.nhlbi.nih.gov/manifest.json @@ -12,7 +12,7 @@ "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2025.01", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2025.01", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:11.0.2", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2025.01", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2025.01", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2025.01", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2025.01", From df5c79db015f59f3d4a039f9d13184e27cc3a121 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal <159047652+krishnaa05@users.noreply.github.com> Date: Wed, 19 Feb 2025 11:41:44 -0600 Subject: [PATCH 2/5] Update integration_tests.yaml --- .github/workflows/integration_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index 2044d48eb5..0bab018f4a 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -11,7 +11,7 @@ jobs: name: Integration tests uses: uc-cdis/gen3-code-vigil/.github/workflows/shared_integration_tests.yaml@chore/manifest_pr_setup with: - SERVICE_TO_TEST: graph_submission + 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 }} @@ -24,4 +24,4 @@ jobs: 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 + CI_SLACK_CHANNEL_ID: ${{ secrets.CI_SLACK_CHANNEL_ID }} From e622908e1af002aaa418092bd5510be983aad8fb Mon Sep 17 00:00:00 2001 From: Krishna Agarwal <159047652+krishnaa05@users.noreply.github.com> Date: Fri, 28 Feb 2025 07:39:43 -0600 Subject: [PATCH 3/5] Update integration_tests.yaml From af97109cbc3bb3c7d2308d4902f9e4533be6ed08 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal <159047652+krishnaa05@users.noreply.github.com> Date: Fri, 28 Feb 2025 08:25:18 -0600 Subject: [PATCH 4/5] Update integration_tests.yaml From 539f182dbf0342878181d1eaabefb8318d5e9f19 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal <159047652+krishnaa05@users.noreply.github.com> Date: Fri, 28 Feb 2025 14:00:02 -0600 Subject: [PATCH 5/5] Update integration_tests.yaml