From c18ed479a3af2df2215835841d796188f04d8759 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal Date: Mon, 24 Feb 2025 15:02:36 -0600 Subject: [PATCH 1/2] initial commit --- .github/labeler.yml | 2 -- .github/workflows/integration_tests.yaml | 27 +++++++++++++++++++++++ .github/workflows/labeler.yml | 12 ---------- Jenkinsfile | 5 ----- brhstaging.data-commons.org/manifest.json | 2 +- data.midrc.org/manifest.json | 2 +- 6 files changed, 29 insertions(+), 21 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..41def6cdf7 --- /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/.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/brhstaging.data-commons.org/manifest.json b/brhstaging.data-commons.org/manifest.json index 0bf084c734..7e36cb7a20 100644 --- a/brhstaging.data-commons.org/manifest.json +++ b/brhstaging.data-commons.org/manifest.json @@ -8,7 +8,7 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.4.2", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.08", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01", "aws-es-proxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/aws-es-proxy:v1.3.1", "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.08", "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", diff --git a/data.midrc.org/manifest.json b/data.midrc.org/manifest.json index 37f1d37e4e..896ed7bb1a 100644 --- a/data.midrc.org/manifest.json +++ b/data.midrc.org/manifest.json @@ -5,7 +5,7 @@ ], "versions": { "ambassador": "quay.io/datawire/ambassador:1.4.2", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2025.01", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.12", "aws-es-proxy": "quay.io/cdis/aws-es-proxy:v1.3.1", "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2025.01", "audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2025.01", From 88ecc0ba89a947ab23a451ad2ce54d379e5e3f00 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal <159047652+krishnaa05@users.noreply.github.com> Date: Fri, 28 Feb 2025 07:39:24 -0600 Subject: [PATCH 2/2] Update integration_tests.yaml --- .github/workflows/integration_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index 41def6cdf7..0bab018f4a 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -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 }}