Commit Graph

248 Commits

Author SHA1 Message Date
evanchia-ly-sdets f0da36a301 Merge pull request #1321 from aws-lumberyard-dev/linux_sanity_fix
fixing linux sanity tests
2021-06-17 09:53:22 -07:00
jromnoa b347257e82 Merge pull request #1295 from aws-lumberyard-dev/Atom/jromnoa/ATOM-14767-update-build-config-and-s3-uploader
ATOM-14767: First PR for s3 uploads on screenshot test failure (AtomSampleViewer & AtomTest depend on this)
2021-06-16 14:51:51 -07:00
jromnoa cd69b7c9d6 do 1 print() call for a failed s3_upload_file() call and add a short 100 millisecond sleep between file upload retries 2021-06-15 14:34:44 -07:00
jromnoa fffff75479 add file check for _build_file_paths() function 2021-06-15 13:55:10 -07:00
jromnoa cac210f25b add check for files in a given path before creating full paths to the files, add output when json.loads() call fails 2021-06-15 11:28:58 -07:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
evanchia 1f31bac640 fixing linux sanity tests 2021-06-14 20:19:19 -07:00
amzn-hdoke 11c3a75321 Enable Client Auth unit test on Linux (#1312) 2021-06-14 13:54:04 -07:00
jromnoa b2bcd6a326 adds TEST_SCREENSHOTS boolean toggle to build_config.json & adds subdirectory searching for upload_to_s3.py script 2021-06-11 18:12:24 -07:00
amzn-mgwynn 63bb8aa8a9 Merge pull request #1286 from aws-lumberyard-dev/Prism/gem-db
updating missed variable name change in logging call
2021-06-11 17:09:42 -07:00
srikappa-amzn 6d15a0d6e9 Merge branch 'stabilization/2106' into FixLinuxBenchmarks 2021-06-11 16:50:03 -07:00
mgwynn a5cead4414 updating missed variable name change in logging call 2021-06-11 19:05:51 -04:00
amzn-mgwynn 5992c1404b Merge pull request #1259 from aws-lumberyard-dev/Prism/gem-db
Adding unit test for project properties cli
2021-06-11 15:56:14 -07:00
lumberyard-employee-dm fe441b01a0 Split the new_tags and delete_tags paramaters if they are strings on spaces. 2021-06-11 15:04:51 -05:00
lumberyard-employee-dm 3127bf7477 Making sure the expected tag set exactly matches the "user_tags" in the project_json 2021-06-11 15:02:15 -05:00
mgwynn 0b3a56d031 Incorporating review comments. Adding checks for json contents. Added class. Minor reformatting. 2021-06-11 15:01:33 -04:00
srikappa-amzn bf1b800136 minor change to order of if and foreach 2021-06-11 10:25:28 -07:00
Eric Phister 0c7605c9b6 Update minimum required CMake version to 3.20 (#1253)
* Update the minimum CMake version to 3.20

Sets the cmake_minimum_required calls to version 3.20 and updates the
README.md to point at the general CMake download page instead of a stale
link.

* Remove unnecessary cmake minimum version

It was using an old 3.0 version and can be removed.

* Additional updates to CMake 3.20, build scripts

Updates the version and remove logic to find a CMake in 3rdParty.

* Removing backup path to ninja path in the build_ninja_windows.cmd

The backup path for finding ninja was coming from the Perforce depot which isn't available for o3de builds.

* Removing reference to 3rdParty Android SDK 29 from the build and run unit test script

The Android SDK is not part of the new 3rdParty system and users are expected to install the Android SDK on their own in order to build the engine for Android.

* Update the get_python scripts and README

No longer try to append a CMake path to LY_3RDPARTY_PATH, but do still
support LY_CMAKE_PATH because there are still uses of it.  Remove
mention of an LY_3RDPARTY_PATH-relative CMake path from the README.md.

* Removing LY_NINJA_PATH from the build_ninja_windows.cmd

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-11 12:00:55 -05:00
hultonha 2d41a701af Merge branch 'stabilization/2106' into tomhh_stabilization-to-development 2021-06-11 09:43:11 +01:00
mgwynn e80ba41bdd Adding project properties test to cmakeLists 2021-06-10 22:08:05 -04:00
mgwynn d029ba894e Added failure condition for fail case test 2021-06-10 21:24:27 -04:00
mgwynn 9a61557932 Adding unit test for project properties cli 2021-06-10 21:17:24 -04:00
Mike Chang 01847ef6dd Changed mac and ios node label
This changes the Mac and iOS job AMI that we're using to Big Sur (OSX 11.4 update). This includes the following based on https://github.com/aws-lumberyard/o3de/tree/development/scripts/build/build_node/Platform/Mac:

- XCode 12.4
- CMake 3.20.3

Note: As of 86136dd, these builds still fail with the same errors as the nightly build under Catalina. See SPEC-7273 and LYN-4071 for details
2021-06-10 17:24:14 -07:00
srikappa-amzn bbae6490d9 Enabled LyTestTools trait only for windows and mac 2021-06-10 14:38:14 -07:00
amzn-sj 607f32fae6 No need to check if the first character is a number. This is already validated before. 2021-06-10 13:34:16 -07:00
amzn-sj 2ee4d8ff6b Sanitize identifier names before substituting them in C++ template files 2021-06-10 11:01:23 -07:00
lumberyard-employee-dm 88d16b23d4 Fixing the enable_gem.py and disable_gem.py commands (#1207) (#1220)
* Fixing the enable_gem.py and disable_gem.py commands (#1207)

* Fixing the enable_gem.py and disable_gem.py commands
The project path wasn't taking into account when querying for gems,
templates and restricted directories registered with the project

Fixing the cmake.py add_gem_dependency and remove_gem_dependency methods
to properly detect a gem within a `set(ENABLED_GEM ...)` cmake variable
Also updated the add_gem_dependency to add the gem right before the end
marker of ')'
Updated the remove_gem_dependency to remove each instance of a gem with
a content that is in between in the `set(ENABLED_GEM ...)` cmake
variable

* Correct Typo in manifest.get_registered doc string

* Removing second get_all_restricted() method
2021-06-09 18:50:28 -05:00
amzn-sj 6c056ad566 Remove duplicate definition of function 2021-06-09 15:29:39 -07:00
daimini d6d2cbae7e Merge branch 'stabilization/2106' into gitflow_210609 2021-06-09 14:26:29 -07:00
lumberyard-employee-dm 217eddc8bd Fixing the enable_gem.py and disable_gem.py commands (#1207)
* Fixing the enable_gem.py and disable_gem.py commands
The project path wasn't taking into account when querying for gems,
templates and restricted directories registered with the project

Fixing the cmake.py add_gem_dependency and remove_gem_dependency methods
to properly detect a gem within a `set(ENABLED_GEM ...)` cmake variable
Also updated the add_gem_dependency to add the gem right before the end
marker of ')'
Updated the remove_gem_dependency to remove each instance of a gem with
a content that is in between in the `set(ENABLED_GEM ...)` cmake
variable

* Correct Typo in manifest.get_registered doc string
2021-06-09 14:14:01 -05:00
Steve Pham 965fced771 SPEC-4524: Script updates to support iOS Unit Test Jobs (#1180) 2021-06-08 15:01:44 -07:00
Esteban Papp b1fca488bf LYN-4332 Metric jobs not passing JOB_NAME, BUILD_NUMBER, NODE_NAME, CHANGE_ID (#1190)
* Fix quotes

* Revert "Fix quotes"

This reverts commit 29ace5ef2bf1c78991a8cfeb840bfb30c4ce5d8d.

* evaluating the parameters

* Revert "Revert "Fix quotes""

This reverts commit 4f7008e9ccbd5fdc0b33853a4fb1f50285233da9.

* just one eval

* double escaping

* another attempt to happiness

* changing NODE_NAME to LABEL_NAME since that one is more stable and doesnt have spaces
2021-06-08 14:24:22 -07:00
Esteban Papp 4b3d0d1054 LYN-4327 [SDK] External Gem's aren't added to the project solution when using SDK (#1191)
* should pickup the external directories registered by the project

* Add support for AzTest and AzTestRunner in the SDK

* missing IMPORT_LIB

* Moved where .Assets targets get generated so they are visible in the SDK

* generate the Directory.Build.props in the right path

* excluding target on platforms that dont support it
2021-06-08 14:01:50 -07:00
Scott Romero 3eb612b652 [main] option for installer upload to s3 (#1173)
Fixed issue with quoted regex when invoking upload_to_s3.py via script
Improved error handling in online install bootstrapper generation commands
2021-06-08 09:30:20 -07:00
evanchia b2a6616a31 fixed cwd error 2021-06-07 18:50:21 -07:00
evanchia 9afe5225e6 removing wildcard from rmdir, not windows compatible 2021-06-07 18:39:03 -07:00
evanchia 9373c5fd0d Fixing xml directory race condition on incremental runs 2021-06-07 18:31:57 -07:00
scottr 57faa2d377 [cpack_installer] installer upload to s3 2021-06-07 15:15:14 -07:00
amzn-mgwynn 38865c95e2 Merge pull request #1162 from aws-lumberyard-dev/Prism/gem-db
Adding python bindings for modifying project properties
2021-06-07 16:59:10 -04:00
mgwynn b0826c5f9c added tag managerment arguments for CLI to mutually exclusive group 2021-06-07 15:08:18 -04:00
mgwynn 6d6f8413c8 Incorporating review comments. Some parameter modifications. Some cli edge case handling. Remove remove_tag member from project info 2021-06-07 14:14:32 -04:00
Ibtehaj Nadeem 1ffcfa07e6 Remove Jenkins failure notifications (#958)
Remove Jenkins failure notifications
2021-06-07 12:53:07 +01:00
Alex Peterson aeaf1bcdbe Fix engine settings not populating or saving
* Allow multiple settings to be registered at once
* Old manifests versions may not have default_third_party_folder
2021-06-04 21:29:36 -07:00
amzn-mgwynn ffdce2ef7f Merge branch 'main' into Prism/gem-db 2021-06-04 23:19:47 -04:00
mgwynn 7984f82e48 Bing project_properties CLI to updateProject method. Update project info struct.
Update project properties cli to support lists for tags. Minor adjustments to support
changes.
2021-06-04 23:03:17 -04:00
Esteban Papp 1396110f6d Preventing builds from cleaning on each step (#1151) 2021-06-04 15:46:19 -07:00
Esteban Papp cf35585bc0 Making incremental linking off by default (#1154) 2021-06-04 15:25:57 -07:00
scottr 0d1b217b24 Merge branch 'main' into cpack_installer 2021-06-04 06:45:43 -07:00
Scott Romero 64872e024e [main] add 3rd party to engine registration
Merge pull request #1131 from aws-lumberyard-dev/default_3rdparty
2021-06-03 19:32:59 -07:00
scottr 4405c2275f [default_3rdparty] changed CLI argument type to pathlib.Path and removed optional str type from usage 2021-06-03 18:23:01 -07:00