Commit Graph

65 Commits

Author SHA1 Message Date
Brian Herrera 674b9d6fdf Remove scrubbing. It cannot run in the o3de repo. 2021-04-09 14:52:20 -07:00
Brian Herrera ae04211f8c Merge branch 'main' into github/staging 2021-04-09 14:42:18 -07:00
Brian Herrera 6f836e4614 Re-add change removed in latest merge. 2021-04-09 14:40:18 -07:00
Esteban Papp e8f6463db0 SPEC-3580 Move Jenkins pipeline files to another folder (#4) 2021-04-09 12:17:34 -07:00
alexpete 8caec43f2a Updating 3rdparty link in README to rev12 2021-04-09 12:04:41 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
evanchia-ly-sdets 302c0aef80 Merge pull request #2 from aws-lumberyard-release/test_metrics_param_removal
Removing unused arg for test metrics
2021-04-09 11:06:46 -07:00
Brian Herrera 69fdd42d59 Set default repo to o3de
Using env prevents setting different repos in a single instance. This will need to be set in another way.
2021-04-09 08:30:29 -07:00
evanchia 0d6a0f4836 Merge branch 'main' into test_metrics_param_removal 2021-04-08 20:47:36 -07:00
evanchia 733899636c Merge branch 'main' into test_metrics_param_removal 2021-04-08 20:44:15 -07:00
Brian Herrera ae62a97894 Merge pull request #3 from aws-lumberyard-release/build/multi-repo-support
Use complete Jenkins project name when creating EBS volumes
2021-04-08 19:35:34 -07:00
Brian Herrera aef10339d5 Use complete Jenkins project name when creating EBS volumes
This change will allow us to support multiple repos in our account by using the full project name for the volumes. Right now multiple repos running the default pipeline will use the same name (e.g. defaultmain<platform>) and will conflict when similar branch names are used.
2021-04-08 17:36:00 -07:00
Brian Herrera b32aa9beda Merge pull request #1 from aws-lumberyard-release/update-lfs-config
Updating lfs endpoint
2021-04-08 16:51:11 -07:00
evanchia 43d39096eb Removing unused arg for test metrics 2021-04-08 15:13:39 -07:00
alexpete 4caeb3ffe4 Updating lfs endpoint 2021-04-08 10:45:16 -07:00
evanchia-ly-sdets afc51ab0d3 Merge pull request #19 from aws-lumberyard-test/metrics_setup
Adding MARS test metrics
2021-04-07 20:27:53 -07:00
evanchia-ly-sdets 041714c614 Merge branch 'main' into metrics_setup 2021-04-07 18:24:54 -07:00
Brian Herrera 4016d6da2f Merge pull request #20 from AMZN-alexpete/github/staging
* Integrating up through commit 90f050496

* Updating 3rdParty link in README

Co-authored-by: Brian Herrera <briher@amazon.com>
2021-04-07 17:59:29 -07:00
Brian Herrera 4eae31c376 Remove git prune step 2021-04-07 16:51:02 -07:00
Brian Herrera 91ae6d2771 Remove scrubbing job from the pipeline
This will need to be ran in its own pipeline
2021-04-07 15:19:09 -07:00
Brian Herrera 20828a0bf4 Add credential id to the checkout step for the mars repo 2021-04-07 14:49:22 -07:00
alexpete edc77e3366 Fixing syntax error 2021-04-07 14:43:14 -07:00
alexpete 004db04c06 Restoring LFS functionality lost in merge 2021-04-07 14:37:21 -07:00
alexpete ae652cc62a Updating 3rdParty link in README 2021-04-07 14:06:18 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
evanchia 5d586cbf64 Adding build step to build job name for test metrics 2021-04-06 16:21:15 -07:00
evanchia 2d13bfda9d Adding build job name to jenkinsfile for test metrics 2021-04-06 14:55:08 -07:00
evanchia e6491ba1aa Adding MARS test metrics 2021-04-05 14:36:52 -07:00
oyongzhi 8f2ed080a9 Merge pull request #15 from oyongzhi/project_path_fix
Project path fix - Changed sys_game_folder to project_path in bootstrap.cfg.
2021-04-01 17:35:24 +01:00
oyongzhi 197973cc2d Merge branch 'main' into project_path_fix 2021-04-01 17:27:49 +01:00
Brian Herrera 5df75c052f Merge pull request #16 from oyongzhi/FlakyAssetBatch2Main
Flaky asset batch2 main
2021-04-01 09:17:15 -07:00
oyongzhi 7dfc79faa0 Move Batch_2_main test block back to main from sandbox. Move single FastScaneWorks_FasterThanFullScan test to sandbox. 2021-04-01 15:49:11 +01:00
oyongzhi fbeb728a61 Move flaky AssetPipelineTests.Batch_2_Main to sandbox 2021-04-01 15:17:40 +01:00
oyongzhi 5ae3ec2894 Restore Joint swing limit Z to 45.0f. 2021-04-01 15:15:05 +01:00
oyongzhi 42966ba1ed Restore joint swing limit Z to 45.0f 2021-04-01 09:40:03 +01:00
oyongzhi 834677d2aa Change sys_game_folder to project_path in bootstrap.cfg 2021-03-31 20:52:29 +01:00
oyongzhi 711cf13e74 To test AR: Reduced joint swing limit Z by 0.01. 2021-03-31 16:21:30 +01:00
Brian Herrera 1121cb96d0 Merge pull request #8 from brianherrera/LoadPipelineFromGitHub
Fix pipeline issues with latest merge to main
2021-03-26 18:03:30 -07:00
Brian Herrera f6cfa752c7 Restore lfs method removed during merge 2021-03-26 17:36:18 -07:00
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 2021-03-26 17:05:57 -07:00
Alex Peterson cfd7789a49 Merge pull request #11 from AMZN-alexpete/github/staging
Integrating latest from github/staging
2021-03-26 16:34:38 -07:00
alexpete e55b89553e Updated 3rdParty package url 2021-03-26 16:16:24 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
Mike Chang 0ad9a6f596 Remove monolithic flag from Readme
Remove monolithic game flag to engine build command
2021-03-26 13:38:52 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
Brian Herrera 3ccdeb21f8 Remove git prune
This step can be handled by Jenkins
2021-03-26 09:05:28 -07:00
Brian Herrera 3393989702 Remove scrubbing from pipeline
This step will need to run in a separate pipeline or action that has access to files that are not located the O3DE repo.
2021-03-26 09:02:02 -07:00
Mike Chang 9c54341af8 Merge pull request #5 from amzn-changml/UpdateReadme
Added build instructions, including 3p
2021-03-25 17:42:31 -07:00
changml c8f1b7b07d Fixed hanging quote 2021-03-25 17:32:40 -07:00