Skip to content

Commit

Permalink
Merge pull request #1116 from uc-cdis/feat/remove-travis-for-gh-actions
Browse files Browse the repository at this point in the history
Remove Travis, add GH Action for Unit Test
  • Loading branch information
k-burt-uch authored Jun 17, 2024
2 parents 89ead72 + 7eee4a5 commit d020edf
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 109 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/buildpipeline.yaml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
name: CI

on:
push:
pull_request:
types: [opened, reopened]

push:
pull_request:
types: [opened, reopened]
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true


jobs:
Security:
name: Security Pipeline
uses: uc-cdis/.github/.github/workflows/securitypipeline.yaml@master
secrets: inherit

UnitTest:
name: Python Unit Test with Postgres
uses: uc-cdis/.github/.github/workflows/python_unit_test.yaml@master
with:
python-version: '3.9'
test-script: 'tests/ci_commands_script.sh'
run-coveralls: true
ci:
name: Build Image and Push
# TODO Add this line back once we update to Python 3.9 from 3.6
# TODO Uncomment after PXP-9212
# needs: Security
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
secrets:
Expand Down
37 changes: 32 additions & 5 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@
}
],
"results": {
".github/workflows/buildpipeline.yaml": [
".github/workflows/ci.yaml": [
{
"type": "Secret Keyword",
"filename": ".github/workflows/buildpipeline.yaml",
"filename": ".github/workflows/ci.yaml",
"hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
"is_verified": false,
"line_number": 17
"line_number": 13
}
],
"deployment/scripts/postgresql/postgresql_init.sql": [
Expand Down Expand Up @@ -210,6 +210,15 @@
"line_number": 137
}
],
"fence/resources/storage/storageclient/cleversafe.py": [
{
"type": "Secret Keyword",
"filename": "fence/resources/storage/storageclient/cleversafe.py",
"hashed_secret": "7cb6efb98ba5972a9b5090dc2e517fe14d12cb04",
"is_verified": false,
"line_number": 274
}
],
"fence/utils.py": [
{
"type": "Secret Keyword",
Expand Down Expand Up @@ -266,7 +275,7 @@
"filename": "tests/conftest.py",
"hashed_secret": "227dea087477346785aefd575f91dd13ab86c108",
"is_verified": false,
"line_number": 1582
"line_number": 1583
}
],
"tests/credentials/google/test_credentials.py": [
Expand Down Expand Up @@ -385,6 +394,24 @@
"line_number": 300
}
],
"tests/storageclient/storage_client_mock.py": [
{
"type": "Secret Keyword",
"filename": "tests/storageclient/storage_client_mock.py",
"hashed_secret": "37bbea9557f9efd1eeadb25dda9ab6514f08fde9",
"is_verified": false,
"line_number": 158
}
],
"tests/storageclient/test_cleversafe_api_client.py": [
{
"type": "Secret Keyword",
"filename": "tests/storageclient/test_cleversafe_api_client.py",
"hashed_secret": "f683c485d521c2e45830146dd570111770baea29",
"is_verified": false,
"line_number": 130
}
],
"tests/test-fence-config.yaml": [
{
"type": "Basic Auth Credentials",
Expand All @@ -395,5 +422,5 @@
}
]
},
"generated_at": "2023-11-16T21:15:57Z"
"generated_at": "2024-03-16T00:09:27Z"
}
53 changes: 0 additions & 53 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions tests/ci_commands_script.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

poetry run pytest -vv --cov=fence --cov-report xml tests
2 changes: 1 addition & 1 deletion tests/test-fence-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ BASE_URL: 'http://localhost/user'
# postgres db to connect to
# connection url format:
# postgresql://[user[:password]@][netloc][:port][/dbname]
DB: 'postgresql://postgres:postgres@localhost:5432/fence_test_tmp'
DB: 'postgresql://postgres:postgres@localhost:5432/postgres'

# A URL-safe base64-encoded 32-byte key for encrypting keys in db
# in python you can use the following script to generate one:
Expand Down
10 changes: 0 additions & 10 deletions travis/pg_hba.conf

This file was deleted.

32 changes: 0 additions & 32 deletions travis/postgresql.conf

This file was deleted.

0 comments on commit d020edf

Please sign in to comment.