Skip to content

Commit 2ab78ec

Browse files
authored
Merge pull request #67 from chicagopcdc/pcdc_dev
Pcdc dev
2 parents b27ea57 + 2ea8b9e commit 2ab78ec

File tree

6 files changed

+312
-322
lines changed

6 files changed

+312
-322
lines changed

.github/labeler.yml

-2
This file was deleted.
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Integration Tests
2+
3+
on: pull_request
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
integration_tests:
11+
name: Integration tests
12+
uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master
13+
with:
14+
SERVICE_TO_TEST: graph_submission
15+
secrets:
16+
CI_AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_ACCESS_KEY_ID }}
17+
CI_AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}
18+
JENKINS_API_TOKEN: ${{ secrets.JENKINS_API_TOKEN }}
19+
QA_DASHBOARD_S3_PATH: ${{ secrets.QA_DASHBOARD_S3_PATH }}
20+
CI_TEST_ORCID_USERID: ${{ secrets.CI_TEST_ORCID_USERID }}
21+
CI_TEST_ORCID_PASSWORD: ${{ secrets.CI_TEST_ORCID_PASSWORD }}
22+
CI_TEST_RAS_USERID: ${{ secrets.CI_TEST_RAS_USERID }}
23+
CI_TEST_RAS_PASSWORD: ${{ secrets.CI_TEST_RAS_PASSWORD }}
24+
CI_SLACK_BOT_TOKEN: ${{ secrets.CI_SLACK_BOT_TOKEN }}
25+
CI_SLACK_CHANNEL_ID: ${{ secrets.CI_SLACK_CHANNEL_ID }}

.github/workflows/labeler.yml

-12
This file was deleted.

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV appname=sheepdog
2424
RUN pip install --upgrade pip poetry
2525
RUN apt-get update && apt-get install -y --no-install-recommends \
2626
build-essential libffi-dev musl-dev gcc libxml2-dev libxslt-dev \
27-
curl bash git vim
27+
curl bash git vim postgresql-client
2828

2929
RUN mkdir -p /var/www/$appname \
3030
&& mkdir -p /var/www/.cache/Python-Eggs/ \

Jenkinsfile

-6
This file was deleted.

0 commit comments

Comments
 (0)