Commit Graph

542 Commits

Author SHA1 Message Date
Nicholas Van Sickle 2c2c1d8137 Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
2021-11-11 15:04:18 -08:00
Pip Potter 4a34686e4e AWS Core CDK: Add option to cleanup resources that are retained by default (#5470)
* Add option to cleanup resources that are retained by default

Signed-off-by: Pip Potter <61438964+lmbr-pip@users.noreply.github.com>
2021-11-11 13:20:47 -08:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2021-11-11 10:15:52 -08:00
AMZN-Phil cd2b1fa91c Merge pull request #5503 from aws-lumberyard-dev/Prism/CLIDelFileFolderFix
Fix trying to remove a cache file
2021-11-10 12:21:31 -08:00
Mike Chang 5a8f95a414 Fix Wix root and installer url config (#5500)
Signed-off-by: changml <changml@amazon.com>
2021-11-10 11:21:49 -08:00
AMZN-Phil f2e191ea77 Fix trying to remove a cache file
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-10 10:28:32 -08:00
Shirang Jia 576248a870 Merge Jenkinsfile from development to stabilization (#5391)
Signed-off-by: shiranj <shiranj@amazon.com>
2021-11-10 10:26:44 -08:00
brianherrera 92f1883cae Remove timeout in the mount step
We no longer need a timeout here. A timeout mechanism was added to the mount script to raise an exeception if the EBS volume is not mounted in the configured timeframe.

This also causes a bug with the retry mechanism where Jenkins will hit this timeout in the event the node goes offline during the setup stage instead of raising an exception.

Signed-off-by: brianherrera <briher@amazon.com>
2021-11-09 11:50:01 -08:00
Brian Herrera 770378959a Merge pull request #5450 from aws-lumberyard-dev/retry-failure-fix
Remove timeout in the mount step
2021-11-09 11:47:55 -08:00
Esteban Papp 85e9ca4692 Fixes for clang-12 (#5435)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-09 11:09:22 -08:00
AMZN-Phil e9c3a453c5 Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates
Add ability to overwrite o3de object when downloading
2021-11-09 10:41:35 -08:00
brianherrera c182b213ad Remove timeout in the mount step
We no longer need a timeout here. A timeout mechanism was added to the mount script to raise an exeception if the EBS volume is not mounted in the configured timeframe.

This also causes a bug with the retry mechanism where Jenkins will hit this timeout in the event the node goes offline during the setup stage instead of raising an exception.

Signed-off-by: brianherrera <briher@amazon.com>
2021-11-09 10:02:11 -08:00
Chris Burel 33d5109fe8 Merge stabilization/2110 as of 20edb35cdc into development (#5319) 2021-11-08 15:22:17 -08:00
Mike Chang 46f4935ee4 Update to licenses/notices script (#5214)
This updates the licenses script to pull in all PackageInfo.json files with a specific argument, then follows each license file defined and writes the contents to a file. In this mode, if a packageinfo file is found, it will only grab the license file path defined within.

Also has the following features:

* Generalizes the function and variable names for non-license specific references
* Sorts os.walk to maintain consistent ordering
* Uses an ordered dict for the output, also to maintain ordering if using Python below 3.7
* Adds an additional json config file to have specific exclusion rules for 3p packages
* Adds a package creation function and config file entry
* Allow multipath scans, optional use of gitignore, merged license file scan

Signed-off-by: Mike Chang <changml@amazon.com>
2021-11-05 14:04:05 -07:00
Esteban Papp eecf6ab920 Create a nightly job that validates project-centric/engine-prebuilt (#5287)
* adds a test_install_profile_vs2019_pipe job to validate a project can build from the SDK

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* missed escaping these variables and breaks runtime dependencines in the install layout

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes to PIPELINE_ENV_OVERRIDE

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Tries to propagate ENV variables from pipeline jobs to jobs under it

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* echoing a var to understand why is not going to the right path

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* put the COMMAND_CWD in the wrong job

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* adding similar jobs for linux/mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* dont pass an empty LY_PROJECTS

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* cmd -> sh, copy-paste mistake

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* inverting check in linux/mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes for linux/mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixing script paths for macos

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes for linux/mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Test use of %% instead of !! for windows builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-05 12:30:19 -07:00
Shirang Jia 08115fc41f Add platform name to AP log path on S3 (#5316)
* Add platform name to AP log path on S3

Signed-off-by: shiranj <shiranj@amazon.com>

* Add platform name to AP log path on S3

Signed-off-by: shiranj <shiranj@amazon.com>
2021-11-05 10:36:14 -07:00
AMZN-Phil 81515b922f Additional readability
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-04 17:10:44 -07:00
AMZN-Phil 31382d080e Remove duplication, additional readability and added missed file
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-04 17:07:02 -07:00
AMZN-Phil 047c5f2231 Add ability to overwrite o3de object when downloading, and to check the last_updated field to check for updates.
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-04 15:09:11 -07:00
Chris Burel d942c90c56 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-04 13:44:22 -07:00
Chris Burel 4ba2c06386 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-04 13:41:15 -07:00
Chris Burel 7d70def688 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-04 13:40:28 -07:00
AMZN-nggieber 4721ef8298 License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-04 13:04:06 -07:00
lumberyard-employee-dm 627012840d Update how Project Filepaths are calculated when not supplied via command line (#5194)
* Fixed the return value of the ConvertToAbsolutePath function

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)

* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Update how the project related file paths are determined when not
supplied.

The project-path determination now goes back to only detecting a "project.json" file.
It no longer attempts to detect a "Cache" directory

The project-cache-path determination now in addition to checking the
project_cache_path key searches for a "Cache" directory.

The project-path defaults to executable folder if it cannot be detected.

The copying of generated executable folder Registry directory contents
to the product cache is now removed after the archive step.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the invocation of the AssetProcessor in Jenkins to supply an
absolute path to the project.

The project-path is no longer treated as relative to the engine root,
but instead relative to the current working directory at application
startup.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added constant for the storing the name of Cache directory

Fixed typos and grammatical errors in the SettingsRegistryMergeUtils.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated UnitTest prepend the EngineRoot path to "AutomatedTesting" when
setting the project path.

This is needed now that the project-path isn't treated relative to the
EngineRoot if it is not absolute.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix AssetSeedManagerTest and PlatformAddressedAssetCatalogManagerTest

Instead of trying to used the AutomatedTesting directory as the project root, the temp directory created during the test is used as the project root.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the setting of the project cache root folder and project
asset platform root folder into the `if (!projectCachePath.empty())`
block

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing the scan up logic for the "Cache" directory.

This is no longer needed to locate the project cache path in a Project Game Release Layout.

Because the project path defaults to the executable directory if, it is not found, the Cache directory will be set to the "Cache" directory within the executable directory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-04 11:02:18 -05:00
Chris Burel d598a7c709 [Linux] Update Jenkins Linux build to use Ubuntu 20, clang 12 (#5035)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-03 18:54:37 -05:00
Shirang Jia d584732116 Fix ap log path on s3 (#5257)
* Fix typo when calling upload_to_s3.py

Signed-off-by: shiranj <shiranj@amazon.com>

* Remove space in extra_args

Signed-off-by: shiranj <shiranj@amazon.com>
2021-11-03 10:45:12 -07:00
Mike Balfour 6d7be70133 Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de
Merging stabilization/2110 to development
2021-11-02 13:33:14 -05:00
lumberyard-employee-dm 6a6d8e6b39 Fixed unit_test_regiser.py test on Linux/Mac (#5031)
Added pathlib.Path.resolve() calls to make sure the compared paths were both absolute

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-02 10:57:31 -05:00
Mike Balfour 508748f39c Merge commit '8aecd6668ae21db3cb80e0063db9d0b37b44f802' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:48 -05:00
Esteban Papp edf5e7a242 Cleanup of validation script exclusions (#5134)
* Validation lists cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-01 11:06:37 -07:00
Brian Herrera fa83a1fff8 Merge pull request #5146 from aws-lumberyard-dev/devops/update-snapshots
Update snapshots list to stablization/2110
2021-11-01 09:59:51 -07:00
Shirang Jia 1ec34f6123 Fix typo when calling upload_to_s3.py (#5139)
Signed-off-by: shiranj <shiranj@amazon.com>
2021-10-29 21:11:53 -07:00
Mike Chang 22820b6a90 Update snapshots list to stablization/2110
Signed-off-by: Mike Chang <changml@amazon.com>
2021-10-29 15:13:20 -07:00
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 18:29:52 -07:00
Esteban Papp 4dcd60ba08 testing changes to fix Jenkins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 17:49:31 -07:00
Esteban Papp ecf70daca8 does this space affects?
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 17:44:16 -07:00
AMZN-Phil d355942e8b Fix an additional location
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-28 16:36:54 -07:00
AMZN-Phil 5971f1176e Fix thrown exceptions if repos does not exist in the manifest
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-28 16:17:28 -07:00
Shirang Jia b8ced0d461 Fix AP log path on S3 (#5068)
Signed-off-by: shiranj <shiranj@amazon.com>
2021-10-28 13:31:33 -07:00
Danilo Aimini 391da332eb Merge commit '767466c57b8e0e3e24d7522e8d8adba4027da04d' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:21:51 -07:00
Shirang Jia 7ab0871327 Upload AP logs when there is an AP eeror (#4896)
* Updating LFS config to new endpoint (#1624)

Signed-off-by: AMZN-alexpete

* Updates licenses to APACHE-2.0 OR MIT (#1685)

Not to be committed before 7/6/2021

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

* Updating CONTRIBUTING.md

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Fixed typo

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Updated text to be more descriptive

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Upload AP logs when there is an AP eeror

Signed-off-by: shiranj <shiranj@amazon.com>

* Add AP log upload step for single step Asset jobs

Signed-off-by: shiranj <shiranj@amazon.com>

* Address more comments

Signed-off-by: shiranj <shiranj@amazon.com>

* Only call CreateUploadAPLogsStage() once in try/catch block

Signed-off-by: shiranj <shiranj@amazon.com>

* Revert acciental update to README.md

Signed-off-by: shiranj <shiranj@amazon.com>

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Co-authored-by: Chris Galvan <chgalvan@amazon.com>
Co-authored-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Co-authored-by: Terry Michaels <miterenc@amazon.com>
2021-10-25 19:16:29 -07:00
AMZN-Phil bec24a85bf Fix old references to gem_list
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-25 15:59:30 -07:00
Mike Chang 62231aeb4c Add xcb input dev packages (#4962)
Signed-off-by: Mike Chang <changml@amazon.com>
2021-10-25 13:48:17 -07:00
Esteban Papp fec1b2fda2 Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
#	cmake/Platform/Common/Install_common.cmake
2021-10-25 12:47:36 -07:00
nggieber 182a7b98b7 Always convert gem_path to pathlib.Path and check it isFile() in case it is a str
Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-22 17:33:30 -07:00
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 17:28:28 -07:00
AMZN-Phil e8a7743aec Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos
Gem Repos can be Refreshed through Project Manager
2021-10-22 17:23:35 -07:00
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data
Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-22 17:19:54 -07:00
nggieber 78e556e5ff Changed gem_list to gem_set
Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-22 16:36:34 -07:00
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:30:02 -07:00