Commit Graph

405 Commits

Author SHA1 Message Date
hultonha a529256274 Add extra logging for CHANGE_ID and COMMIT_ID - TIAF
Merge pull request #3328 from aws-lumberyard-dev/jenkins_commit_hash_log
2021-08-20 10:45:41 +01:00
Junbo Liang c93a18ab82 Update the AWS automation tests to use existing CloudFormation stacks (#3092) 2021-08-19 14:05:25 -07:00
John dcde3f3e36 Add extra logging for CHANGE_ID and COMMIT_ID.
Signed-off-by: John <jonawals@amazon.com>
2021-08-19 18:18:45 +01:00
Shirang Jia e48798fdbf Add missing {} for string interpolation (#3291) 2021-08-18 10:02:24 -07:00
Shirang Jia 3e51240a05 Allow customized Jenkins parameters for different pipelines and add aws integration deployment pipeline (#3248)
Allow customized Jenkins parameters for different pipelines so that we can define different Jenkins parameters for a new pipeline and doesn't affect AR build parameters.

Add aws integration deployment pipeline.
2021-08-17 15:25:32 -07:00
jonawals 252c268ffd Fix corrupt merge. (#3142)
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
2021-08-16 16:09:36 +01:00
jonawals 5925bd22f6 Further subdivide TIAF data by suite. (#3128)
* Further subdivide TIAF data by suite.
* Key fix typo.

Signed-off-by: John <jonawals@amazon.com>
2021-08-16 14:15:02 +01:00
John a1d855a920 Invert corner case flag for readability.
Signed-off-by: John <jonawals@amazon.com>
2021-08-13 10:03:09 +01:00
John 4dd39c3929 Address commit re-run corner case.
Signed-off-by: John <jonawals@amazon.com>
2021-08-13 09:55:06 +01:00
jonawals ff659fbbb6 Tiaf bucket top level fix (#3085)
* Revert to regular run when invalid commits used.

* Cirrect s3 logging of last commit hash storage

* Add s3 top level url and build number script params.

* Use existing REPOSITORY_NAME env var.

Signed-off-by: John <jonawals@amazon.com>
2021-08-12 12:48:23 -07:00
John 199273b880 Remove positional argument from change list generaiton.
Signed-off-by: John <jonawals@amazon.com>
2021-08-12 12:00:51 +01:00
John 9601db55aa Add sanity checking to last commit hash.
Signed-off-by: John <jonawals@amazon.com>
2021-08-12 11:19:48 +01:00
John 268a7f547e Add additional logging to s3 storage.
Signed-off-by: John <jonawals@amazon.com>
2021-08-12 11:19:27 +01:00
jonawals f4e8ecd35e TIAF script fixes (#3044)
* Fix typo in MARS document key.

Signed-off-by: John <jonawals@amazon.com>

* Add diff support for commits on different branches.

Signed-off-by: John <jonawals@amazon.com>

* Restore archiving of historic data objects.

Signed-off-by: John <jonawals@amazon.com>

* Correctly handle commit diffs for PR builds.

Signed-off-by: John <jonawals@amazon.com>

* Comment out archiving of historic data objects.

Signed-off-by: John <jonawals@amazon.com>

* Fix python typo

Signed-off-by: John <jonawals@amazon.com>

* Remove comment pertaining to s3 bucket.

Signed-off-by: John <jonawals@amazon.com>

* Fix test selection efficiency for MARS.

Signed-off-by: John <jonawals@amazon.com>
2021-08-12 10:21:33 +01:00
Chris Galvan 0f8ea17235 Merge pull request #3051 from aws-lumberyard-dev/cgalvan/gitflow_210811_dev
Merged stabilization/2106 to development
2021-08-11 17:41:29 -05:00
Junbo Liang c6714595b1 Define a new Jenkins build script to deploy AWS resources (#2983)
* Define a new Jenkins job to deploy AWS resources

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

* Address PR comments

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

* Add error checking for all the calls

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

* Remove the weekly-build-metrics tag

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

* Parameterize ARN/Region and move it to a Jenkins envvar.

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

* Revert the changes for build_config.json

Signed-off-by: junbo <junbo@amazon.com>
2021-08-11 13:59:29 -07:00
Chris Galvan 5b0046ce78 Resolved conflicts in merge from stabilization/2106 -> development.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-11 15:33:50 -05:00
jonawals a7a0e8d2ef Fix for PathLib unlink wrong version parameter. (#3020)
* Fix for PathLib unlink wrong version parameter.

* Fix dst target for TIAF.

* Remove TIAF historic data arhciving on s3 buckets

* Change permissions for TIAF bucket upload

Signed-off-by: John <jonawals@amazon.com>
2021-08-10 18:43:44 -07:00
John 5dbbb93a06 Fix path for subprocess
Signed-off-by: John <jonawals@amazon.com>
2021-08-10 15:49:19 +01:00
John e3221224be Add traceback to tiaf exception handler.
Signed-off-by: John <jonawals@amazon.com>
2021-08-10 15:34:27 +01:00
John 2be043ca96 Fix None comparisons in TIAF scripts.
Signed-off-by: John <jonawals@amazon.com>
2021-08-10 15:13:19 +01:00
John c2a2d1c5c7 Add changes from TIF/Feature branch.
Signed-off-by: John <jonawals@amazon.com>
2021-08-10 14:20:46 +01:00
lumberyard-employee-dm 9afbd07a88 Added new feature to the register command to auto detect manifest file based on input path (#2967)
* Added new feature to the register command to auto detect the correct
o3de manifest file to write to based on the supplied registration path

Updated the create-gem command to register the gem on creation.

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

* Added new feature to the register command to auto detect the correct
o3de manifest file to write to based on the supplied registration path

Updated the create-gem command to register the gem on creation.

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

* Fix incorrect variable reference in register_project_path

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

* Fixed o3de python package unit test
The enable_gem, register and engine template test have been updated to
account for the logic to register a gem after creation

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

* Added a --no-register arg to engine-template.py
This allows registration of gems/projects using the create-project and
create-gem commands to be skipped

Prevented registration of a gems and projects in the engine_template
command test

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

* Wrapped first parameter to find_ancestor_dir_containing_file with
pathlib.PurePath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-09 16:58:19 -05:00
Sean Sweeney 54b93d7c25 Merge pull request #2885 from aws-lumberyard-dev/test_metrics_env_var_fix
Escape character in Jenkins for test metrics
2021-08-09 14:03:02 -07:00
Scott Romero 0999a7f6e4 [development] s3 upload script now replicates directory structure relative to search root (#2947)
Previously the script was using the full local path as the artifact key when uploading to s3. This was causing the installer artifacts to be uploaded incorrectly and non-functional for normal use.

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-08-09 08:48:51 -07:00
Shirang Jia 4f9382e8c6 Include build failure root cause in email notification (#2491) (#2888)
Signed-off-by: shiranj <shiranj@amazon.com>
2021-08-06 12:52:04 -07:00
AMZN-nggieber 2c7f6f9742 Adds Links to Gem Directory and Documentation for Gems (#2922)
* Changed blue text to white that is not meant as a link, made 'View in Director' link work for gems in the inspector, added parsing for gem documentation link

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

* Added documentation links for gems, changed markup for urls in summaries and requirements so they are clickable

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

* Fixed a couple of the documentation links

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

* Added documentation url to edit gem properties script and updated unit tests

Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-06 10:19:35 -05:00
evanchia 3a76f2e6ce Fixing incorrect string replacement in Jenkinsfile
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-05 17:41:06 -07:00
lumberyard-employee-dm a65b326558 Fixed the enable-gem command unit test (#2880)
* Fixed the enable-gem command unit test

The enable-gem unit test would fail if there wasn't an
o3de_manifest.json file in the users $HOME/.o3de directory

The change now is to patch the call to load the o3de manifest

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

* Adjustments to the enable-gem command unit test to pass on Linux

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-05 16:58:57 -05:00
evanchia 574bef0cd8 Escape character in Jenkins for test metrics
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-05 10:19:15 -07:00
Shirang Jia 4b817a6483 Include build failure root cause in email notification (#2491)
Signed-off-by: shiranj <shiranj@amazon.com>
2021-08-04 17:57:47 -07:00
lumberyard-employee-dm 21ca3a4aea The enable-gem command registers gem with project if not registered (#2817)
* The enable_gems command now registers the gem with the project if only registered with o3de_manifest.json

Updated the `enable_gems` command to register the gem with the project if the gem is not registered with either the project or the engine being used.
This allows the gem to be added to the build system if it wasn't registered before.

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

* Adding quoting around the invocation of the OpenProjectManager command

The --project-path parameter now is able to pass in a path with spaces
to the invocation of the Project Manager.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-04 13:13:28 -05:00
lumberyard-employee-dm 055df37482 Register show command fix (#2408)
* Updated print_registration functions to fix "register-show" command

Added unit test to validate the argparse options to the register show
command.

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

* Updated the register.py script to once again register an engine list

Previosly each engine were registered into a dictionary with multiple
keys, but once the engine.json started to self describe the registered
content that came with it, it was reduced to a single 'path' key.
Therefore it has been changed to a list to be consistent with other o3de
object paths

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

* Updated the SettingsRegistryMergeUtitls Code which parses the attempts to locate the engine path associated associated with the project.json engine key to check the 'engines_path' object within the o3de_manifest.json

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

* Updated print registration unit test to patch the get_project_path

This is to make sure that the existence of the placeholder project path
isn't validated when running the test

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

* Typo and formatting fixes for the print_registration script

Also corrected indentation in unit_test_print_registration script

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-28 16:21:37 -05:00
lumberyard-employee-dm 6868a48bb0 Adding o3de.py subcommands for engine.json and gem.json modification (#2411)
The new commands are edit-engine-properties and edit-gem-properties
They can modify specific fields within these manifest files, that should
affect build system.

More importantly, this commands can be used to modify the "engine_name"
field in the engine.json and the "gem_name" field in the gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-27 22:04:37 -05:00
Esteban Papp da474357f3 Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

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

* handling case where a parameter can be empty

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

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-26 14:14:56 -07:00
amzn-sean 3ade098742 support node switching in a pipe (#2345)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-07-26 11:16:13 +01:00
Esteban Papp 00f50f2a90 Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-20 09:00:08 -07:00
Brian Herrera 173126f5a5 Add script for license scanner (#2267)
* Add script for license scanner

This script will scan the source tree for license files and generate a file with the contents of all the licenses.

Signed-off-by: brianherrera <briher@amazon.com>
2021-07-19 16:09:47 -07:00
Chris Burel f3cb0ee94d Remvoe Jenkins build configuration for unsupported VS2017 compiler
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-19 13:30:35 -07:00
Esteban Papp 82f89d596e Merge branch 'development' into cmake/SPEC-7179 2021-07-16 18:27:30 -07:00
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
Esteban Papp 1f9b284de2 Merge branch 'development' into cmake/SPEC-7179
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
#	Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
#	Code/Editor/Plugins/EditorCommon/stdafx.cpp
#	Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
#	Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
#	Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
#	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
#	Code/Tools/AssetProcessor/native/precompiled.h
#	Code/Tools/Standalone/StandaloneTools_precompiled.h
#	Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
#	Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
#	Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
#	Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
#	Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
#	Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
#	Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
#	Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
#	Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
#	Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
#	Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
#	Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
#	Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
#	Gems/Blast/Code/Source/StdAfx.cpp
#	Gems/Camera/Code/Source/Camera_precompiled.h
#	Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
#	Gems/FastNoise/Code/Source/FastNoise_precompiled.h
#	Gems/Gestures/Code/Source/Gestures_precompiled.h
#	Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
#	Gems/GraphCanvas/Code/precompiled.h
#	Gems/ImGui/Code/Source/ImGui_precompiled.h
#	Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
#	Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
#	Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
#	Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
#	Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
#	Gems/LyShine/Code/Source/LyShine_precompiled.h
#	Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
#	Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
#	Gems/Maestro/Code/Source/Maestro_precompiled.h
#	Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
#	Gems/Metastream/Code/Source/Metastream_precompiled.h
#	Gems/Microphone/Code/Source/Microphone_precompiled.h
#	Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
#	Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
#	Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
#	Gems/PhysX/Code/Source/PhysX_precompiled.h
#	Gems/PhysX/Code/physx_unsupported_files.cmake
#	Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
#	Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
#	Gems/ScriptCanvas/Code/Editor/precompiled.h
#	Gems/ScriptCanvas/Code/Source/precompiled.h
#	Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
#	Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
#	Gems/ScriptEvents/Code/Source/precompiled.h
#	Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
#	Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
#	Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
#	Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
#	Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
#	Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
#	Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
#	Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
#	Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
#	Gems/Twitch/Code/Source/Twitch_precompiled.h
#	Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
#	Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
#	Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
2021-07-16 15:42:37 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
2021-07-16 13:21:55 -07:00
Esteban Papp 2f2bbc7d43 no message
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-13 11:02:16 -07:00
Shirang Jia 23f690cd55 Cleanup incremental build scripts (#2004)
* Cleanup incremental build scripts

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

* Fix timeout function since signal.SIGALRM is not available on Windows

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

* Convert missing fstrings

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

* Add PipelineAndBranch back to EBS volume tag

Signed-off-by: shiranj <shiranj@amazon.com>
2021-07-12 16:58:33 -07:00
Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
Merged stabilization/2106 to development
2021-07-12 14:05:19 -05:00
brianherrera 41e864de95 Remove separate git lfs steps.
The steps to remove git lfs hooks and inject creds are no longer required with the public repo.

Signed-off-by: brianherrera <briher@amazon.com>
2021-07-12 11:12:26 -07:00
brianherrera 1121bf6e60 Remove separate git lfs steps.
The steps to remove git lfs hooks and inject creds are no longer required with the public repo.

Signed-off-by: brianherrera <briher@amazon.com>
2021-07-12 09:14:16 -07:00
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00