Commit Graph

617 Commits

Author SHA1 Message Date
Alex Peterson 73419387c5 Check engines_path in get_registered (#6828)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2022-01-11 16:49:59 -08:00
lumberyard-employee-dm f09055af42 Fixed CMake use with Android NDK 23 (#6460)
* Fixed CMake use with Android NDK 23

This was done by only setting the `ANDROID_ARM_MODE` if the ANDROID_ABI
starts with `armeabi`.

The Android arm mode setting can't be used using non-`armeabi` ABIs.
In O3DE we default to `arm64-v8a` `ANDROID_ABI`
So `ANDROID_ARM_MODE` must not be set.

The CMake [Android-Determine.cmake](https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/Platform/Android-Determine.cmake#L573-585) which is used to detect platform-wide information when the CMAKE_SYSTEM_NAME is set to android, enforces that if the `CMAKE_ANDROID_ARCH_ABI` doesn't start with `armeabi`, then it will fatal error if the CMAKE_ANDROID_ARM_MODE option is set.

In Android NDK 21 the `ANDROID_ARM_MODE` variable is used to set the CMAKE_ANDROID_ARM_MODE variable if the [ANDROID_ABI](https://android.googlesource.com/platform/ndk/+/refs/tags/ndk-r21e/build/cmake/android.toolchain.cmake#700) starts with `armeabi`.

This meant when using Android NDK 21, the CMake Android-Determine.cmake module would succeed, due
to the CMAKE_ANDROID_ARM_MODE not being set.

In Android NDK 23 the `ANDROID_ARM_MODE` now will set the
`CMAKE_ANDROID_ARM_MODE` variable to `TRUE` if it isn't defined.

Added an `--extra-cmake-configure-args` option to the `generate_android_project.py` script which can be used to append user specified CMake arguments to the cmake configure step (`cmake -B <build-dir> -S <source-dir> -DCMAKE_TOOLCHAIN_FILE=<android-toolchain-file> <extra-args>`)

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

* Updated the O3DE Android toolchain wrapper to fatal error if the 64-bit
arm ABI isn't used.

Also removed the unneccessary setting of the ANDROID_ARM_MODE and
ANDROID_ARM_NEON option option now that the armeabi cannot be specified
as an ABI.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-10 19:11:00 -06:00
Esteban Papp 0f7e55cf59 Some fixes for paths with spaces (#6757)
* Some fixes for paths with spaces

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

* PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-10 10:00:29 -08:00
Junbo Liang 67a89c6cd0 Fix an issue where npm is not found (#6706)
Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2022-01-07 10:51:08 -08:00
Mike Chang 6a171d1769 Windows installer build tag date fix (#6735)
Makes the % string replacement optional in the palSh function

Signed-off-by: Mike Chang <changml@amazon.com>
2022-01-06 16:41:35 -08:00
Esteban Papp 54e0b8b7b5 Enabling mac tests (#6716)
* Adds mac test job

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

* Points to sysctl properly to handle zsh

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

* Fixes some macos differences with Linux when reading the CTEST_RUN_FLAGS parameters

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

* adding the test job to the profile pipe

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

* Disables some tests in Mac that are not passing

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

* passes config to cli_test_driver and sets the right trait for the test (pytest instead of lytesttools)

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

* Set proper traits for AtomRHI

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

* Corrected AZ_TRAIT_UNIT_TEST_PERLINE_GRADIANT_GOLDEN_VALUES_7878 values for Mac

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

* Disables EMotionFX tests in Mac

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

* Removes debugging prints

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

* Removes filters that were meant just for Linux

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

* quotes are re-quoted in the test_mac.sh script

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-06 16:16:48 -08:00
Esteban Papp 741a9059f6 More packaging cleanup (#6728)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-06 12:13:23 -08:00
Shirang Jia 1d0cd46cb7 Escape % for windows batch in palSh (#6688)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
2022-01-05 09:54:52 -08:00
evanchia 0f2e33af68 Changed test artifact upload check
Signed-off-by: evanchia <evanchia@amazon.com>
2022-01-03 16:48:20 -08:00
Junbo Liang 75476032ab Define AWSI automation tests pipe for Jenkins (#6518)
* Define AWSI automation tests pipe for Jenkins

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2022-01-03 11:59:03 -08:00
Mike Chang ce709b99d0 Development dockerfile for Linux (#6532)
This is the initial Dockerfile used for local development or for remote CI environments for Ubuntu. Build and test instructions are in the Dockerfile comments.

Signed-off-by: Mike Chang <changml@amazon.com>
2021-12-22 14:58:31 -08:00
dependabot[bot] a4df91b718 Bump pyyaml in /scripts/build/build_node/Platform/Common (#6514)
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3.1 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.3.1...5.4)

---
updated-dependencies:
- dependency-name: pyyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-20 17:38:47 -08:00
Junbo Liang 9ee60e6eba AWSI automation tests support on Linux (#6278)
* AWSI automation tests support on Linux

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2021-12-20 12:15:52 -08:00
nggieber 3cf85bb562 Fix project properties test
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
2021-12-10 14:12:14 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
Shirang Jia cc242b2239 Fix pipeline name passed to post ar build sns (#6305)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
2021-12-09 18:16:19 -08:00
Sean Sweeney c6e06a64ca Merge pull request #6264 from aws-lumberyard-dev/upload_test_artifacts
Modified Jenkinsfile to upload test artifacts on failure
2021-12-09 15:23:13 -08:00
evanchia 2db4927f73 added clarifying comment
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-09 14:05:30 -08:00
evanchia 117939f605 fixed env var check
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-09 11:24:18 -08:00
evanchia 73ca596c35 added env var check for test artifact upload
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-09 09:48:24 -08:00
evanchia 4d3a6169cb removing the jobname from test artifact upload directory
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-09 09:42:33 -08:00
Shirang Jia 6e6845dbf3 Pass pipeline name to post ar build sns topic (#6274)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
2021-12-08 18:52:28 -08:00
lumberyard-employee-dm 003727ca57 Fixed the get_registration.py script to print the manifest data (#6236)
Added a --project-engine-name/-pen argument to print_registration.py to
output the engine registered with the project.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-12-08 18:08:51 -06:00
evanchia 4992bce4c2 Modified Jenkinsfile to upload test artifacts on failure
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-08 14:09:48 -08:00
Esteban Papp cd5306febf Merging from development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-07 12:35:41 -08:00
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-06 09:42:33 -08:00
lumberyard-employee-dm 83cb085a28 Fixed the register.py command with a --project-path to check against a (#6158)
supplied --engine-path parameter to determine if it should update the
project.json if one has been provided.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-12-06 11:24:04 -06:00
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
2021-12-06 09:22:03 -08:00
Esteban Papp b1eeebb6b6 Removes some leftover log
More Linux fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-03 15:21:58 -08:00
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-03 13:35:16 -08:00
Esteban Papp dc52140569 Fixes the diff detection of cmd in linux and mac
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-03 11:40:25 -08:00
Sean Sweeney 3c189bdb9a Merge pull request #6076 from aws-lumberyard-dev/disable_unused_testresults
disabling unused test results jobs
2021-12-03 10:57:15 -08:00
Mike Chang 8b3c76d8b8 Add platform specific codesign script and modifications for Linux and Windows installer packaging (#5893)
Signed-off-by: Mike Chang <changml@amazon.com>
2021-12-01 17:14:00 -08:00
evanchia 7e8822b1a8 disabling unused test results jobs
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-01 14:25:55 -08:00
Esteban Papp 1a46f548a7 Remove unused scripts/build/package (#5885)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-01 09:14:07 -08:00
Shirang Jia 58be7c27ed Make scrubber/validator not depend on legacy packaging scripts (#6053)
* Make validator not depend on legacy packaging scripts

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

* Remove unused glob_to_regex.py

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

* Remove unsued import path

Signed-off-by: Shirang Jia <shiranj@amazon.com>
2021-11-30 16:46:03 -08:00
Esteban Papp fb6e6e339f Add CRC validator (#5857)
* Adds crc validation checks

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

* Fixes invalid CRCs

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

* Changes test to smoke suite

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

* excludes some test data from the validator

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

* uses pathlib instead of os.path

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

* fixes wrong path to test scripts

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

* Escape not needed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-30 15:07:57 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-30 11:10:02 -08:00
AMZN-AlexOteiza aac540c022 Re-enabled prefab tests (#5867)
* Re-enabled prefab tests

* Added missing lib for linux
2021-11-29 17:00:48 +00:00
Mike Chang 28e2681b65 Add signer script and new gpg signing cert (#5847)
* Add signer script and new gpg signing cert

Signed-off-by: Mike Chang <changml@amazon.com>
2021-11-23 13:41:55 -08:00
Esteban Papp 75bb0f24ad Msbuild warning fix for jenkins (#5818) 2021-11-23 13:16:04 -08:00
Shirang Jia ebd679d8cf Don't fail the build when AP logs upload fails (#5849)
* Fix retry of failures from catch block

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

* Make the build unstable when AP load fails

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

* Remove test codes

Signed-off-by: Shirang Jia <shiranj@amazon.com>
2021-11-22 17:46:49 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840)
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

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

* Removes unneded space

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

* Changes how we get the NDK folder

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

* needs delayed expansion

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

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-22 14:21:02 -08:00
Esteban Papp 7100d48e16 Cherry-picking some changes from stabilization into development (#5810)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-19 15:59:21 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de
Merge stabilization/2110
2021-11-19 15:46:16 -08:00
Shirang Jia c0080d6b1f Archive ap logs on s3 (#5620)
* Archive ap logs on s3

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

* Update copy_file.py

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

* Fix syntax from bad copy

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

* Change underscore in argument name to dash

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

* Add a general ArchiveArtifactsOnS3 function so we can use it to archive any files on S3

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

* Swap order of excludes and includes

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

* Change artifactsSourceDir to artifactsSource since the value can be either a file or a directory

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

* Fix parameter

Signed-off-by: Shirang Jia <shiranj@amazon.com>
2021-11-19 10:45:09 -08:00
puvvadar 0c1a0391fa Merge commit '77279bfd55396524d3ba00c7b4407237e546035d' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:22 -08:00
puvvadar d056555388 Merge commit 'd30fdb759d07e54d36309680ffa4247f1481ceb2' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:45 -08:00
puvvadar 89235fb546 Merge commit '76d2e125c294e1183ef55320417fa34a6f9d5e27' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:56 -08:00
lumberyard-employee-dm 77279bfd55 Prevent updates to o3de_manifests.json if it is corrupted. (#5776)
This behavior can be overridden using the --force option.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-19 11:04:53 -06:00