Skip to content

Commit

Permalink
Merge pull request adoptium#259 from nadeensami/issue-3163
Browse files Browse the repository at this point in the history
Remove runAqaConfig.json
  • Loading branch information
sophia-guo authored Feb 4, 2022
2 parents fdd9c21 + 3ade761 commit 46b8192
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/runAqaConfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"workflow_repo": "adoptium/TKG",
"custom_openjdk_testrepo": true,
"custom_openj9_repo": true,
"custom_tkg_repo": false
"workflow_repo": "adoptium/TKG"
}
11 changes: 4 additions & 7 deletions scripts/testBot/runAqaArgParse.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,15 @@ def main():
parser.add_argument('--platform', default=['x86-64_linux'], nargs='+')
parser.add_argument('--jdk_version', default=['8'], nargs='+')
parser.add_argument('--jdk_impl', default=['openj9'], choices=['hotspot', 'openj9'], nargs='+')

parser.add_argument('--openjdk_testrepo', default=['adoptium/aqa-tests:master'], nargs='+')
parser.add_argument('--openj9_repo', default=['eclipse-openj9/openj9:master'], nargs='+')
parser.add_argument('--tkg_repo', default=['adoptium/TKG:master'], nargs='+')

# Custom repo options which may be enabled/disabled in the `runAqaConfig.json` file.
with open('main/.github/workflows/runAqaConfig.json') as f:
config = json.load(f)
if 'workflow_repo' in config:
parser.add_argument('--workflow_repo', default=[config['workflow_repo']], nargs='+')
if config['custom_openjdk_testrepo']:
parser.add_argument('--openjdk_testrepo', default=['adoptium/aqa-tests:master'], nargs='+')
if config['custom_openj9_repo']:
parser.add_argument('--openj9_repo', default=['eclipse-openj9/openj9:master'], nargs='+')
if config['custom_tkg_repo']:
parser.add_argument('--tkg_repo', default=['adoptium/TKG:master'], nargs='+')

args = vars(parser.parse_args(raw_args))
# All args are lists of strings
Expand Down

0 comments on commit 46b8192

Please sign in to comment.