Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WX-905 #7012

Merged
merged 215 commits into from
Feb 21, 2023
Merged

WX-905 #7012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
89fb748
workflow trial 1
Jan 18, 2023
a7f5fe7
udate
THWiseman Jan 18, 2023
c619a61
remove trigger
THWiseman Jan 18, 2023
900da1b
add workflow_dispatch
THWiseman Jan 18, 2023
41b4fc5
fix spelling mistake
THWiseman Jan 18, 2023
b742a6b
echo environment variables
THWiseman Jan 18, 2023
2c8fe94
typo
THWiseman Jan 18, 2023
ef5540f
change enviornment variable scope
THWiseman Jan 18, 2023
3960e6a
it was working the first time
THWiseman Jan 18, 2023
047b957
here goes nothing
THWiseman Jan 23, 2023
f8f73c7
getting my bearings
THWiseman Jan 23, 2023
85e949e
dotslash
THWiseman Jan 23, 2023
a028550
are you suuuuure git?
THWiseman Jan 23, 2023
9207552
checkout first
THWiseman Jan 23, 2023
49c45bf
formatting
THWiseman Jan 23, 2023
2daf2d6
try this
THWiseman Jan 23, 2023
6fc8470
steal from adam
THWiseman Jan 23, 2023
776e4a9
with scala
THWiseman Jan 23, 2023
426044a
full steal
THWiseman Jan 23, 2023
6b30ef4
v3 newer than v2
THWiseman Jan 24, 2023
61704c8
moment of truth
THWiseman Jan 24, 2023
4c70191
will this work?
THWiseman Jan 24, 2023
da89730
this is the secret sauce
THWiseman Jan 24, 2023
6c623ed
This should still be working
THWiseman Jan 25, 2023
e6cd875
one more test
THWiseman Jan 25, 2023
23b5f53
try again
THWiseman Jan 25, 2023
079b3c6
spelling
THWiseman Jan 25, 2023
b435c7a
rename file
THWiseman Jan 25, 2023
d1e7629
comments
THWiseman Jan 25, 2023
2da9d83
optimize command
THWiseman Jan 25, 2023
9d12de0
test with matrix
THWiseman Jan 25, 2023
076ed6a
try something else
THWiseman Jan 25, 2023
75c0955
tab
THWiseman Jan 25, 2023
efbc02c
more realistic workflow
THWiseman Jan 25, 2023
8bb541c
why fail fast if you can prolong your failure
THWiseman Jan 25, 2023
3476796
continue on error
THWiseman Jan 25, 2023
6b8afdb
syntax
THWiseman Jan 25, 2023
e9018d8
updated yaml
THWiseman Jan 26, 2023
f6cce2f
git secrets attempt
THWiseman Jan 26, 2023
b727570
bigger test suite
THWiseman Jan 26, 2023
a399d12
path stuff
THWiseman Jan 26, 2023
c36fd91
yolo
THWiseman Jan 26, 2023
0349d6d
name cache setup
THWiseman Jan 26, 2023
d84cbab
hyphens
THWiseman Jan 26, 2023
aee9df5
steps
THWiseman Jan 26, 2023
aaeee6f
do we even need that?
THWiseman Jan 26, 2023
adcfae8
yes we need that
THWiseman Jan 26, 2023
eda3f89
please don't break the internet
THWiseman Jan 26, 2023
81ce1da
syntax error this
THWiseman Jan 26, 2023
a985a64
desparate
THWiseman Jan 26, 2023
d4da61f
no more
THWiseman Jan 26, 2023
3132a19
case sensitive and so am I
THWiseman Jan 26, 2023
ae82349
commentos
THWiseman Jan 26, 2023
3a158ea
rename and polish
THWiseman Jan 26, 2023
4e0821c
this will not work
THWiseman Jan 30, 2023
a1b4f4b
newlines
THWiseman Jan 30, 2023
8076020
yaml
THWiseman Jan 30, 2023
d00fe60
error lol
THWiseman Jan 30, 2023
9272636
pipe
THWiseman Jan 30, 2023
2ccbc76
one step closer
THWiseman Jan 30, 2023
602c5ee
idk
THWiseman Jan 30, 2023
53df19c
syntax why
THWiseman Jan 30, 2023
cd78e00
yeye
THWiseman Jan 30, 2023
9a93df0
back to basics
THWiseman Jan 30, 2023
b691681
advanced techniques
THWiseman Jan 30, 2023
897bb7a
this wont work either
THWiseman Jan 30, 2023
025eea8
nope
THWiseman Jan 30, 2023
89a5607
try again
THWiseman Jan 30, 2023
f155b49
aisd
THWiseman Jan 30, 2023
f28381e
pipe got lost
THWiseman Jan 30, 2023
e978ad4
quotatsions
THWiseman Jan 30, 2023
e4f6f82
trying
THWiseman Jan 30, 2023
8d702de
\s
THWiseman Jan 30, 2023
778af44
rome was built from the command line
THWiseman Jan 30, 2023
7eff689
i cant keep coming up with commit messages
THWiseman Jan 30, 2023
a62a754
working?
THWiseman Jan 30, 2023
11101fb
Escape asterisks
jgainerdewar Jan 30, 2023
c4341da
Does this work?
jgainerdewar Jan 30, 2023
39e6270
Also escape dollar sign
jgainerdewar Jan 30, 2023
ceed50e
Testing
jgainerdewar Jan 30, 2023
df46ef6
More escaping
jgainerdewar Jan 30, 2023
de6704b
Less escaping
jgainerdewar Jan 30, 2023
9afc8c9
Testing
jgainerdewar Jan 30, 2023
c9640c6
EVEN MORE ESCAPING
jgainerdewar Jan 30, 2023
29cc772
What if we didn't use brackets at all
jgainerdewar Jan 30, 2023
fc01ca7
Testing
jgainerdewar Jan 30, 2023
76290cd
Testing
jgainerdewar Jan 30, 2023
c924572
Testing
jgainerdewar Jan 30, 2023
997f5a7
Testing
jgainerdewar Jan 30, 2023
3cfee4a
Testing
jgainerdewar Jan 30, 2023
0470963
Testing
jgainerdewar Jan 30, 2023
5d11931
Testing
jgainerdewar Jan 30, 2023
e83e7a4
Testing
jgainerdewar Jan 31, 2023
678f77a
Testing
jgainerdewar Jan 31, 2023
cc209c4
Testing
jgainerdewar Jan 31, 2023
069c1a6
Testing
jgainerdewar Jan 31, 2023
8368318
Testing
jgainerdewar Jan 31, 2023
9c8b38c
Remove color codes
jgainerdewar Jan 31, 2023
db128af
Try the whole thing
jgainerdewar Jan 31, 2023
461c0aa
Oops
jgainerdewar Jan 31, 2023
6358c75
Revert test changes, remove trailing comma
jgainerdewar Jan 31, 2023
52ee24f
Leave comma to deal with later, add comment
jgainerdewar Jan 31, 2023
15d9302
here goes nothing
THWiseman Jan 31, 2023
bf91a06
whitespace
THWiseman Jan 31, 2023
74796d4
using secrets
THWiseman Jan 31, 2023
247f412
comments
THWiseman Jan 31, 2023
d184b6f
yolo
THWiseman Jan 31, 2023
68fc894
indent
THWiseman Jan 31, 2023
962c04f
idgetit
THWiseman Jan 31, 2023
0302bc6
indent
THWiseman Jan 31, 2023
afe4d3b
this is dumb
THWiseman Jan 31, 2023
01fbece
copypasta
THWiseman Jan 31, 2023
37bca13
asd
THWiseman Jan 31, 2023
019f333
actionable
THWiseman Jan 31, 2023
5aa1271
whitespace
THWiseman Jan 31, 2023
e9dc5f6
remove newline:
THWiseman Jan 31, 2023
857ad95
lets seeeeee
THWiseman Jan 31, 2023
97b3666
what is even in there:
THWiseman Jan 31, 2023
7fb8069
the ol doubble commar
THWiseman Jan 31, 2023
a78c30f
the double dot
THWiseman Jan 31, 2023
f4d7216
dont ask questions
THWiseman Jan 31, 2023
54aaee3
y
THWiseman Jan 31, 2023
8403b9f
2
THWiseman Jan 31, 2023
fcf9c8f
5
THWiseman Jan 31, 2023
eaa4852
lol
THWiseman Jan 31, 2023
2609146
whitespoace
THWiseman Jan 31, 2023
f4837f8
a
THWiseman Jan 31, 2023
33fe63c
whoops
THWiseman Jan 31, 2023
df0fbc7
better formatting
THWiseman Jan 31, 2023
05ff151
commento
THWiseman Jan 31, 2023
4e338c4
eof
THWiseman Jan 31, 2023
58e8f80
length
THWiseman Jan 31, 2023
13b0062
speedtest without cache
THWiseman Jan 31, 2023
d9da2ed
cacheless speedtest
THWiseman Jan 31, 2023
e00aad3
kids call these things hashtags
THWiseman Jan 31, 2023
83b8daf
address PR feedback with liberal use of the delete key
THWiseman Jan 31, 2023
4bc0bc8
fix up some comment
THWiseman Feb 1, 2023
9d18737
new yaml
THWiseman Feb 2, 2023
50853a2
testing
THWiseman Feb 2, 2023
4103cab
testing
THWiseman Feb 2, 2023
da3a5af
testing
THWiseman Feb 2, 2023
048f052
testCentaurLocal
THWiseman Feb 2, 2023
684455e
hardcodedpath
THWiseman Feb 2, 2023
07e54f6
testing
THWiseman Feb 2, 2023
c76cb78
testing
THWiseman Feb 2, 2023
1c14d29
testing
THWiseman Feb 2, 2023
cd7da8c
testing
THWiseman Feb 2, 2023
f0a1088
testing
THWiseman Feb 3, 2023
9dac3d7
testing
THWiseman Feb 3, 2023
25ff7e6
testing
THWiseman Feb 3, 2023
2e7b879
testing
THWiseman Feb 3, 2023
3b071bb
syntax
THWiseman Feb 3, 2023
b31b72c
testing
THWiseman Feb 3, 2023
30f3efb
testing
THWiseman Feb 3, 2023
e6b095b
tesitng
THWiseman Feb 3, 2023
832adc3
tesitng
THWiseman Feb 3, 2023
bc12969
added github case
THWiseman Feb 6, 2023
bbde442
testing
THWiseman Feb 6, 2023
83e39b3
testing
THWiseman Feb 6, 2023
b42b36b
testing
THWiseman Feb 6, 2023
15accf9
testing
THWiseman Feb 6, 2023
6ab676e
testing
THWiseman Feb 6, 2023
2514575
updated gitignore
THWiseman Feb 7, 2023
adcee04
testing
THWiseman Feb 7, 2023
10b87e8
testing
THWiseman Feb 7, 2023
f2e6e9c
testing
THWiseman Feb 7, 2023
27601ca
testing
THWiseman Feb 7, 2023
2d2b45f
testing
THWiseman Feb 7, 2023
a78cfb2
testing
THWiseman Feb 7, 2023
47691a8
Merge branch 'develop' into WX-905
THWiseman Feb 9, 2023
42427ac
testing
THWiseman Feb 9, 2023
947d2dc
testing
THWiseman Feb 9, 2023
5406492
remove java
THWiseman Feb 9, 2023
7f53170
testing
THWiseman Feb 9, 2023
f094e2b
testing
THWiseman Feb 9, 2023
2a3c41a
testing
THWiseman Feb 9, 2023
50b92b5
testing
THWiseman Feb 9, 2023
d35e788
testing
THWiseman Feb 9, 2023
c9674dc
testing
THWiseman Feb 9, 2023
45d64f3
testing
THWiseman Feb 9, 2023
a9327ea
testing
THWiseman Feb 9, 2023
7b3351c
spelling
THWiseman Feb 9, 2023
335104a
testing
THWiseman Feb 10, 2023
4c6e4ee
testing
THWiseman Feb 10, 2023
a9f1bc7
testing
THWiseman Feb 10, 2023
21de2ec
testing
THWiseman Feb 10, 2023
283d84b
testing
THWiseman Feb 10, 2023
6e8a5d3
testing
THWiseman Feb 10, 2023
e6ff227
testing
THWiseman Feb 10, 2023
b8a6a0d
testing
THWiseman Feb 10, 2023
70e3701
testing
THWiseman Feb 10, 2023
591c55a
testing
THWiseman Feb 10, 2023
d8ba529
testing
THWiseman Feb 10, 2023
eb25522
cleanup
THWiseman Feb 10, 2023
b4ea121
testing
THWiseman Feb 10, 2023
fee57ff
comments
THWiseman Feb 10, 2023
8bbd7d2
testing
THWiseman Feb 10, 2023
a4e3c58
testing
THWiseman Feb 10, 2023
6b25da0
whitespace
THWiseman Feb 10, 2023
f9e712b
commento
THWiseman Feb 10, 2023
90b0c7b
commento
THWiseman Feb 10, 2023
a3504d0
testing
THWiseman Feb 10, 2023
d51bdf8
testing
THWiseman Feb 10, 2023
032693a
these should pass
THWiseman Feb 13, 2023
c4a69a0
Merge branch 'develop' into WX-905
THWiseman Feb 13, 2023
1454c3f
testing PR comments
THWiseman Feb 13, 2023
3356d8a
remove unused name
THWiseman Feb 13, 2023
2da0bae
testing name
THWiseman Feb 13, 2023
dfcda98
naming
THWiseman Feb 13, 2023
8cd79e0
Friendly Names
THWiseman Feb 13, 2023
4648e53
Friendly Names
THWiseman Feb 13, 2023
81246a4
Miguel saved a life today
THWiseman Feb 13, 2023
dbfb293
testing
THWiseman Feb 16, 2023
e0ff370
back out overzealous tests
THWiseman Feb 16, 2023
f227458
make tests trigger on merge queue
THWiseman Feb 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cromwell_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ run-name: ${{ github.actor }} running Cromwell sbt unit tests.
on:
workflow_dispatch: #Manual trigger from GitHub UI
push:
merge_group:

permissions:
contents: read
Expand Down
83 changes: 83 additions & 0 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: 'Integration Tests'

#This github action runs all of Cromwell's integration tests.

#This is what shows up in the github workflows page as the title.
run-name: ${{ github.actor }} Integration Testing.

#What will trigger the workflow to run.
on:
workflow_dispatch: #Manual trigger from GitHub UI
push: #git push
merge_group:

permissions:
contents: read

jobs:
integration-tests:
strategy:
fail-fast: false #disabling fail-fast means that even if one test fails, the others will still try to complete.
#Each entry below is a single integration test that lives in /src/ci/bin/.
#Each will be launched on its own runner so they can occur in parallel.
#Friendly names are displayed on the Github UI and aren't used anywhere else.
matrix:
include:
- build_type: centaurPapiV2beta
build_mysql: 5.7
friendly_name: Centaur Papi V2 Beta with MySQL 5.7
- build_type: dbms
friendly_name: DBMS
- build_type: centaurTes
build_mysql: 5.7
friendly_name: Centaur TES with MySQL 5.7
- build_type: centaurLocal
build_mysql: 5.7
friendly_name: Centaur Local with MySQL 5.7
- build_type: checkPublish
friendly_name: Check Publish
- build_type: centaurAws
build_mysql: 5.7
friendly_name: Centaur AWS with MySQL 5.7
- build_type: centaurDummy
build_mysql: 5.7
friendly_name: Centaur Dummy with MySQL 5.7
- build_type: centaurHoricromtalPapiV2beta
build_mysql: 5.7
friendly_name: Centaur Horicromtal PapiV2 Beta with MySQL 5.7
- build_type: horicromtalDeadlock
friendly_name: Horicromtal Deadlock
- build_type: singleWorkflowRunner
friendly_name: Single Workflow Runner
- build_type: centaurLocal
build_mariadb: 10.3
friendly_name: Centaur Local with MariaDB 10.3
- build_type: centaurLocal
build_postgresql: 11.3
friendly_name: Centaur Local with PostgreSQL 11.3
- build_type: centaurEngineUpgradeLocal
build_mysql: 5.7
friendly_name: Centaur Engine Upgrade Local with MySQL 5.7
name: ${{ matrix.friendly_name }}
env:
BUILD_NAME: ${{ matrix.build_type }}
BUILD_TYPE: ${{ matrix.build_type }} #intentionally duplicated variable
BUILD_MYSQL: ${{ matrix.build_mysql }}
BUILD_POSTGRESQL: ${{ matrix.build_postgresql }}
BUILD_MARIADB: ${{ matrix.build_mariadb }}
VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID_CI }}
VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID_CI }}
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v3 # checkout the cromwell repo
- uses: ./.github/set_up_cromwell_action #This github action will set up git-secrets, caching, java, and sbt.
with:
cromwell_repo_token: ${{ secrets.BROADBOT_GITHUB_TOKEN }}
#This script bascially just looks up another script to run, assuming that the other script's filename is:
#src/ci/bin/test${BUILD_TYPE}.sh. The first letter of the BUILD_TYPE is automatically capitalized when looking.
- name: Run Integration Test
run: |
set -e
echo Running test.sh
./src/ci/bin/test.sh
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ tags
target
/site

#from running integration tests locally
actual.json
console_output.txt
expected.json
run_mode_metadata.json

# custom config
cromwell-executions
cromwell-test-executions
Expand Down
39 changes: 37 additions & 2 deletions src/ci/bin/test.inc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ cromwell::private::create_build_variables() {
CROMWELL_BUILD_PROVIDER_TRAVIS="travis"
CROMWELL_BUILD_PROVIDER_JENKINS="jenkins"
CROMWELL_BUILD_PROVIDER_CIRCLE="circle"
CROMWELL_BUILD_PROVIDER_GITHUB="github"
CROMWELL_BUILD_PROVIDER_UNKNOWN="unknown"

if [[ "${TRAVIS-false}" == "true" ]]; then
Expand All @@ -91,6 +92,8 @@ cromwell::private::create_build_variables() {
CROMWELL_BUILD_PROVIDER="${CROMWELL_BUILD_PROVIDER_JENKINS}"
elif [[ "${CIRCLECI-false}" == "true" ]]; then
CROMWELL_BUILD_PROVIDER="${CROMWELL_BUILD_PROVIDER_CIRCLE}"
elif [[ "${GITHUB_ACTIONS-false}" == "true" ]]; then
CROMWELL_BUILD_PROVIDER="${CROMWELL_BUILD_PROVIDER_GITHUB}"
else
CROMWELL_BUILD_PROVIDER="${CROMWELL_BUILD_PROVIDER_UNKNOWN}"
fi
Expand Down Expand Up @@ -300,6 +303,21 @@ cromwell::private::create_build_variables() {
CROMWELL_BUILD_RUN_TESTS=true
fi
;;
"${CROMWELL_BUILD_PROVIDER_GITHUB}")
CROMWELL_BUILD_IS_CI=true
CROMWELL_BUILD_IS_SECURE=true
CROMWELL_BUILD_TYPE="${BUILD_TYPE}"
CROMWELL_BUILD_BRANCH="${GITHUB_REF_NAME}"
CROMWELL_BUILD_EVENT="${GITHUB_EVENT_NAME}"
CROMWELL_BUILD_TAG=""
CROMWELL_BUILD_NUMBER="${GITHUB_RUN_ID}"
CROMWELL_BUILD_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
CROMWELL_BUILD_GIT_USER_EMAIL=""
CROMWELL_BUILD_GIT_USER_NAME="${GITHUB_ACTOR}"
CROMWELL_BUILD_HEARTBEAT_PATTERN="…"
CROMWELL_BUILD_GENERATE_COVERAGE=true
CROMWELL_BUILD_RUN_TESTS=true
;;
*)
CROMWELL_BUILD_IS_CI=false
CROMWELL_BUILD_IS_SECURE=true
Expand Down Expand Up @@ -476,7 +494,8 @@ cromwell::private::create_database_variables() {

case "${CROMWELL_BUILD_PROVIDER}" in
"${CROMWELL_BUILD_PROVIDER_TRAVIS}"|\
"${CROMWELL_BUILD_PROVIDER_CIRCLE}")
"${CROMWELL_BUILD_PROVIDER_CIRCLE}"|\
"${CROMWELL_BUILD_PROVIDER_GITHUB}")
CROMWELL_BUILD_MARIADB_HOSTNAME="localhost"
CROMWELL_BUILD_MARIADB_PORT="23306"
CROMWELL_BUILD_MARIADB_DOCKER_TAG="${BUILD_MARIADB-}"
Expand Down Expand Up @@ -633,7 +652,8 @@ cromwell::private::create_centaur_variables() {
# Pick **one** of the databases to run Centaur against
case "${CROMWELL_BUILD_PROVIDER}" in
"${CROMWELL_BUILD_PROVIDER_TRAVIS}"|\
"${CROMWELL_BUILD_PROVIDER_CIRCLE}")
"${CROMWELL_BUILD_PROVIDER_CIRCLE}"|\
"${CROMWELL_BUILD_PROVIDER_GITHUB}")

if [[ -n "${CROMWELL_BUILD_MYSQL_DOCKER_TAG:+set}" ]]; then
CROMWELL_BUILD_CENTAUR_SLICK_PROFILE="slick.jdbc.MySQLProfile$"
Expand Down Expand Up @@ -1436,6 +1456,21 @@ cromwell::build::setup_common_environment() {
cromwell::private::setup_pyenv_python_latest
cromwell::private::start_docker_databases
;;
"${CROMWELL_BUILD_PROVIDER_GITHUB}")
# Try to login to vault, and if successful then use vault creds to login to docker.
# For those committers with vault access this avoids pull rate limits reported in BT-143.
cromwell::private::install_vault
cromwell::private::login_vault
cromwell::private::login_docker
#Note: Unlike with other CI providers, we are using Github Actions to install Java and sbt for us.
#This is automatically handled in the set_up_cromwell Github Action, which can be found in
#[cromwell root]/.github/set_up_cromwell_aciton.
cromwell::private::install_docker_compose
cromwell::private::delete_boto_config
cromwell::private::delete_sbt_boot
cromwell::private::upgrade_pip
cromwell::private::start_docker_databases
;;
"${CROMWELL_BUILD_PROVIDER_JENKINS}"|\
*)
;;
Expand Down