Commit Graph

400 Commits (33cbc2db219cb77d088cb15c1774c86d9b1be9aa)

Author SHA1 Message Date
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Shirang Jia 55a3b41222
Fix unmounting error (#1940) 5 years ago
Shirang Jia 992f5aab1b
Convert Incremental scripts to Python3 (#1934)
Convert incremental build script to Python3
5 years ago
hultonha 40726a32dc
Merge pull request #1898 from aws-lumberyard-dev/hultonha/gitflow_210706_o3de
stabilization2106 -> development merge (210706)
5 years ago
jonawals a3d14e217e
Change TIAF seed criteria. (#1857)
We currently cannot predict when a given snapshot will be taken. This is
problematic as test impact analysis assumes that the coverage data will
be updated after each run. As we have no control over when our coverage
data will persist we will instead always seed when the pipeline and
branch is one of the seeding pipelines, otherwise we will attempt to
read that seed data and perform test impact analysis (if no seed data is
present we will fall back to a regular, uninstrumented run of all test
targets).

This approach has the following implications:

1. PR builds will benefit from test impact analysis as the seed data is
    (hopefully) available at the time the snapshot is created.

2. Builds for the aforementioned seeding branches and pipelines will not
    benefit from test impact analysis and will incur the cost of seeding
    regardless of whether or not that generated seed data ends up in the
    snapshot.

Signed-off-by: John <jonawals@amazon.com>
5 years ago
hultonha dee65914f0 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha/gitflow_210706 5 years ago
lumberyard-employee-dm 8592e4fbbe
Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively (#1880)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
John 17fde4e228 Move source of truth logic from TIAF to job 5 years ago
lumberyard-employee-dm d73a98aa2f
Added detection of gems which are not directly under an external subdirectory root (#1841)
* Added proper detection of the list of Gems in the Project Templates
enabled_gems.cmake file

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

* Added a CMake alias target for the Atom Gem and the AtomLyIntegration

Both of those targets just aliases the Atom_AtomBridge gem
Therefore they turn on Atom

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

* Replacing the Atom_AtomBridge gem in the project template with the Atom gem

The Atom gem is just an alias to the Atom_AtomBridge gem

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

* Updated the manifest.py gem gathering logic to recurse through the external subdirecotories locating gem.json files to discover all gems in a subdirectory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Chris Galvan b9e06e70d9 Fixed copyright header issues per new validator
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
AMZN-Phil b3fd63a0f3
Merge branch 'stabilization/2106' into LYN-4507 5 years ago
lumberyard-employee-dm 2478c60793
Fixed several o3de python package and install layout issues (#1714)
* Updated the CrashLog directory path to save to the project user
directory instead of the engine-root directory

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

* Removing the custom OUTPUT_NAME for the Multiplayer Gem Builder target

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

* Changed the default value for the LY_3RDPARTY_PATH cache variable to be
~/.o3de/3rdParty

This simplifies the first time user experience when running cmake

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

* Fixed Windows only issue where using creating a VS Solution for an O3DE project on a different drive resulted in an unloaded "<drive letter>:" entry appearing in the solution explorer

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

* Refactored install layout logic for External Subdirectories

Instead of performing a regular expression over the Gems/* directory, now the each external subdirectory including the project (external) directory is recursied over and scanned for any folders that aren't excluded.
By default those folders are the [Cc]ache, [Bb]uild and [Uu]ser directories

Afterwards the list files to copy over are then split into a directory list and a file list that is filtered by an include regex
Next the directory list is iterated over and the directories are copied to the install layout
Finally the file list is iterated and the list of files are also copied to the install layout

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

* Fixed the o3de.bat script changing the working directory before running the o3de.py script

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

* Fixed exception in engine-template.py script when the create-gem command
is invoked with the --template-name parameter that does not correspond
to a registered Template

Updated the create-project command to register the project with the
o3de_manifest.json and the engine with the project as the final step

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

* Fixed register.py over-registration of non-engine directories when then
--this-engine parameter is supplied.
All the projects, gems and templates inside of the default o3de_manifest
folder locations were being registered with the engine that was being
registered

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

* Fixed register.py register_project_path() method to return 0 when the
project path is successfully registered.

This issue was that the save_o3de_manifest method "return" value was
being checked and that method doesn't actually return a value

Added question mark to the engine_template.py to correct text around
notifying the user if the project was registered

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

* Added doc comment on the new cmke ly_get_vs_folder_directory function()

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

* Added clarifying comment to the ly_setup_others() command logic to copy over directories and files from any external subdirectories(Gems) that are registered with the engine at the time of install

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

* Fixed infinite recursion when trying to create a template with the
source directory used to seed the template

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
pconroy a0b754bb4d Fix return value when multiple projects are removed and one fails
Signed-off-by: pconroy <pconroy@amazon.com>
5 years ago
pconroy ae6a424064 Make remove_invalid_o3de_projects take a path and return a value
Signed-off-by: pconroy <pconroy@amazon.com>
5 years ago
pconroy e0c3d15d5a Remove deleted projects from project manager
Signed-off-by: pconroy <pconroy@amazon.com>
5 years ago
Shirang Jia af9f1aaae0
Remove unused package filelist (#1687) 5 years ago
AMZN-ScottR 6af01fc378 Merge branch 'stabilization/2106' into installer/2106-engine-name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
5 years ago
AMZN-ScottR 56ce9908a5 [installer/2106-engine-name] update installer job to override engine name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Brian Herrera 1b3eb1d44d
Merge pull request #1689 from aws-lumberyard-dev/pipelines/SPEC-7574
Add parameter so created EBS volumes are encrypted
5 years ago
brianherrera 0b75ebcdd8
Add parameter so created volumes are encrypted.
Signed-off-by: brianherrera <briher@amazon.com>
5 years ago
Gene Walters dd206caf37 Updating pytest to work with new project_property::edit_project_props parameters
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 9f0bbf3b74
SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Gene Walters f905b71844 Adding missing o3de copyright headers
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
John ea2115089b Correct tiaf output path to use foward slash dirs
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John 6067ab38c8 Parameterize build dir and make job explicit profile
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John aa94effd26 Fix snapshot choice that was incorrectly added
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John cfe4a49136 Address PR comments
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John 3c31424e92 Address PR comments
Signed-off-by: John <jonawals@amazon.com>
5 years ago
John 992e8500ea Add snapshot selection to PR and non-PR builds.
PR builds will detect the destination branch and check if that branch
is one of the snapshot branches, otherwise it defaults to the 'development'
snapshot.

Non-PR builds use the user-selected snapshot from the list of available
snapshots.

Signed-off-by: John <jonawals@amazon.com>
5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
Esteban Papp acce801b41
SPEC-7435 Vegetation Tests Reference Missing File: Mocks/MockSpawnableEntitiesInterface.h 5 years ago
John cfe839e89e Address PR comments 5 years ago
John c831304c8a Address PR comments 5 years ago
John 38f852d8b9 Add snapshot selection to PR and non-PR builds.
PR builds will detect the destination branch and check if that branch
is one of the snapshot branches, otherwise it defaults to the 'development'
snapshot.

Non-PR builds use the user-selected snapshot from the list of available
snapshots.
5 years ago
scottr 7b1ac7dd4e Merge branch 'stabilization/2106' into cpack/2106-license-url 5 years ago
evanchia-ly-sdets e9e740e355
Merge pull request #1527 from aws-lumberyard-dev/linux_sanity_fix
fixing linux sanity tests
5 years ago
Scott Romero 2480dedcd9
[stabilization/2106] Inclusion of 3rd party license manifest file in installer package (#1483) 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
scottr 4b9c7c79b8 [cpack/2106-license-url] update to use correct license URL for installer job 5 years ago
Alex Peterson aa885e5d0b
Fix project creation (#1445)
* Add ability to change project name

* Fixed several issues where path types were changed

* Added PythonBindings CreateProject unit test

* Fix python warning format

* Validate new project name in CLI

* Fix issue creating pathview on linux

* Use better testing macros

* Refactored the unit_test_engine_template.py test to actually test
against the current engine_template.py commands

The commands of create-template, create-from-template, create-project
and create-gem is now being validated.

Registered the unit_test_engine_template.py script with CTest in the smoke test
suite so that it runs in Automated Review

Fixed issues in the engine_template.py script where the template_restricted_path parameter was required in the create_project and create_gem functions

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Esteban Papp 78b8daa783
LYN-4745 ci_build_metrics doesnt distinguish between different repo (#1496)
* add repository to ci_build_metrics

* fixing build

* changing the job to pass the right parameters

* passing parameters that need to be expanded

* missed this, important

* fixing typo
5 years ago
SJ cb2d64b205
Add parameters to specify custom native build path and enable unity build in Android gradle builds (#1494)
* Add parameters to specify custom native build path and enable unity build in Android gradle builds

* Enable unity build for gradle to shorten the path to the generated object files which fixes build failures on Jenkins due to paths exceeding limit. This also speeds up builds.
5 years ago
scottr 46f7ecb7e6 [cpack/2106-license-url] update installer job to include license terms url 5 years ago
scottr e568004dd2 [cpack/2106-3p-manifest] update installer job with 3rd party SPDX license url 5 years ago
Scott Romero c05943abf4
[stabilization/2106] installer jenkins job fixes and improvements (#1453)
Updated installer job tags to be included in nightly clean builds
Fixed escaping issue with passing installer framework env var to cmake
Removed enforcement of aws profile for uploading
Various changes to shorten the install path cpack uses
Added cpack log file dump on error
Added build tagging from git repo info to installer job
Fixed bug causing bootsrapper to crash on secondary machines
5 years ago
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
5 years ago
Esteban Papp 44d8e7b804
LYN-4666 Make AR builds use the stabilization/2106 snapshot (#1440)
* use snapshots out of stabilization

* temporal print to figure out why the mount is not used

* removing print used for debugging
5 years ago
scottr 36929f59ae Merge branch 'stabilization/2106' into cpack/jenkins-main 5 years ago
greerdv b69b6af305 add copyright notice 5 years ago
greerdv 40a84c3c74 add editor python script to help with migrating levels with non-uniform scale 5 years ago
scottr 64a960e428 Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main 5 years ago
scottr 00bb33587a [cpack/jenkins-main] fixed bug applying some cpack build job parameters 5 years ago
scottr 26017c1b49 Merge branch 'stabilization/2106' into cpack/jenkins-main 5 years ago
scottr 3ca839a580 [cpack/jenkins-main] update installer job params and how they are applied 5 years ago
scottr e8f250bed8 [cpack/jenkins-main] rework build tag generation to be at cpack time through LY_INSTALLER_AUTO_GEN_TAG 5 years ago
scottr 21d92a414e [cpack/jenkins-main] update commit date format string to something that works on all machines 5 years ago
scottr 646fc30dab [cpack/jenkins-main] build tag generator script now uses jenkins env vars and matches commands used 5 years ago
scottr f03b3623d4 [cpack/jenkins-main] fixed git date format on unix machines in jenkinsfile 5 years ago
scottr 68d90366a8 [cpack/jenkins-main] missed escaping a character in git command for jenkinsfile 5 years ago
scottr c507422760 [cpack/jenkins-main] update build url tag generation to use existing env vars from Jenkins 5 years ago
scottr a0d6e29198 [cpack/jenkins-main] additional logging to build id generator script 5 years ago
scottr a057cbb03a [cpack/jenkins-main] updated installer job params 5 years ago
scottr 8b68aa9f5a [cpack/jenkins-main] rework build tagging to include git repo info in installer job 5 years ago
amzn-hdoke 556d607a5e
Make AWSCore.Editor tests windows only (#1410) 5 years ago
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 5 years ago
scottr 1519180cec [cpack/stabilization/2106-jenkins] updated installer job params to make the online version 5 years ago
scottr 7011bb66f1 [cpack/stabilization/2106-jenkins] missed cpack log file path shortening 5 years ago
scottr 1d8fb2a7f7 [cpack/stabilization/2106-jenkins] fixed installer framework include in jenkins job 5 years ago
scottr 059324add9 [cpack/stabilization/2106-jenkins] updated installer job tags to run nightly 5 years ago
scottr 8279b65622 [cpack/stabilization/2106-jenkins] updated installer job temp dir to use WORKSPACE_TMP and added log file dump on error 5 years ago
John e4d4f8555b Merge branch 'development' into TIF/Runtime 5 years ago
Esteban Papp 96da6c6438
LYN-3244 Remove ebp_sanity_smoke_no_gpu (#1386) 5 years ago
lumberyard-employee-dm 7dabe8b6e9
Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)
* Fixed organization of the AssetProcessor SourceAssetBrowser

Assets within the Engine Root were grouped under a '/' entry.
That has been fixed to use the relative path within the engine root for
those assets
Assets outside of the Engine Root, but on the same drive were using
absolute paths before. Now there are child entries that navigate up the
directory hierarchy to those asset locations

* Added ly_enable_gems call to Atom gems targets that are required

The DefaultLevel.prefab contains several Atom components, that require
the Atom RHI, RPI, Common_Feature, ShaderBuilder and AtomLyIntegration CommonFeatures
gems to be enabled in order to successfully process in the
AssetProcessor.

* Added ly_enable_gems call to make the Camera gem required in Tools,
Builders and Clients.

This is needed as the DefaultLevel.prefab contains an Editor Camera
Component

* Adding the ly_enable_gem call to make the Maestro gem required

CrySystem currently requires Maestro to be enabled in order to
initialize

* Added ly_enable_gems call to the SceneProcessing gem to make it required

The SceneCore and SceneData libraries that are part of the core engine
Code folder requires the SceneProcessing gem to be enabled in order to
invoke the InitializeDynamicModule hooks in DllMain.cpp in order to
initialize those libraries.

* Fixed bad argument in comment for Prefab CMakeLists.txt

* Fixed Assert in Asset Builders due to the Atom RPI Builder

The Atom RPI Builder was enabling the Asset Catalog for the ScriptAsset a second time

The Atom Feature Common EditorSystemCommonComponent.cpp which also loads
in the AssetBuilder is enabling the Asset Catalog for the ScriptAsset

Added BehaviorContext reflection to the OutputDeviceTransformType enum
to fix the BehaviorContext errors about reflecting a method that returns
such an enum

* Added TypeId output to the JsonDeserializer report message about missing
ClassData

Previously the report callback would indicate that the target type was
missing Serialization class data, but didn't indicate the TypeId of the
target type

* Added support to the ly_enable_gems function to be able to support
0 gems being enabled.

Updated the Install step for CMake to propagate any ly_enable_gems
within a CMakeLists.txt for a target into the generated CMakeLists.txt
that is made for each installed IMPORTED target

* Adding newline to the end of the Camera Gem CMakeLists.txt

* Fixing target TYPE parameter for actual Gem Modules to use the GEM_MODULE tag instead of MODULE

* Reverting change to the DESTINATION directory for the installed CMakeLists.txt to use the relative path to the installed directory

* Adding the Atom_Bootstrap gem as a required gem

The Client and GameLaunchers required the Atom_Bootstrap gem in order to create the NativeWindow
Added Atom_Feature_Common client module as a runtime dependency of the AtomLyIntegration CommonsFeature client module

* Fixed register.py --all-projects-path and --all-gems-path arguments to
NOT register projects or gems that are within a template folder
Fixed reading of old pre-1.0 o3de_manifest.json files where the
"engines" key was a json array

* Changed how the relative target source directory is calculated when that source directroy resides outside of the engine root.
The final dirname component is used with a unique SHA256 has to form a <dirname>-<8 char SHA256> folder for installing files into

* Adding newline to the end of Atom_Bootstrap CMakeLists.txt

* Moving ly_enable_gems variants for Tools and Builders inside of PAL_TRAIT_BUILD_HOST_TOOLS block

* Adding a comment to AWSCore.ResourceMappingTool target to indicate that it is not a GEM_MODULE.
Furthermore it cannot be loaded with the Gem system because the library is in a different directory the executable
5 years ago
evanchia-ly-sdets f0da36a301
Merge pull request #1321 from aws-lumberyard-dev/linux_sanity_fix
fixing linux sanity tests
5 years ago
John 22093f46fc Merge branch 'development' into TIF/Runtime 5 years ago
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)
5 years ago
John 15bf2d20ed Merge branch 'development' into TIF/Runtime 5 years ago
John a1c6cb80a0 Fix double test failure policy 5 years ago
John e7e68d3ba3 Set test failure policy to continue 5 years ago
John b1508b522f Add build output folder to tiaf driver 5 years ago
John 17ba9f5c4f Force non-gating at script level 5 years ago
lumberyard-employee-dm 4014cacff8
Added a ${GemName}.Builders variant to Asset-Only Gems (#1324)
* Creating Builder variant aliases for all Asset Gems

* Added an AssetGem template for creating an Asset Gem

The AssetGem template is meant for non-code Gems

* Updated the engine_template.py commands to use pathlib

Each of the four commands: create-template, create-from-template,
create-project and create-gem have been updated to use pathlib.Path or
any path manipulation

Fix several python errors when instantiating a template with missing
o3de objects.
For example attempting to use the create-project command with the
"DefaultGem" template would result in a python exception instaed of a
error log and a return value 0..

Added a **force** option to the engine_template commands
to force overriding of existing files

* Optimized search through text files when the create-template command is
run when attempting to replace the license text section

* Adding a Minimal Project Template that contains the minimal set of gems
as stated by UX

* Minor changes to the DefaultProject template. Added a license section to the EngineFinder.cmake

* Adding the MinimalProject to the engine.json file
5 years ago
jromnoa cd69b7c9d6 do 1 print() call for a failed s3_upload_file() call and add a short 100 millisecond sleep between file upload retries 5 years ago
jromnoa fffff75479 add file check for _build_file_paths() function 5 years ago
jromnoa cac210f25b add check for files in a given path before creating full paths to the files, add output when json.loads() call fails 5 years ago
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
5 years ago
John 2606234cfa Merge branch 'main' into TIF/Runtime 5 years ago
evanchia 1f31bac640 fixing linux sanity tests 5 years ago
amzn-hdoke 11c3a75321
Enable Client Auth unit test on Linux (#1312) 5 years ago
jromnoa b2bcd6a326 adds TEST_SCREENSHOTS boolean toggle to build_config.json & adds subdirectory searching for upload_to_s3.py script 5 years ago
amzn-mgwynn 63bb8aa8a9
Merge pull request #1286 from aws-lumberyard-dev/Prism/gem-db
updating missed variable name change in logging call
5 years ago
srikappa-amzn 6d15a0d6e9 Merge branch 'stabilization/2106' into FixLinuxBenchmarks 5 years ago
mgwynn a5cead4414 updating missed variable name change in logging call 5 years ago
amzn-mgwynn 5992c1404b
Merge pull request #1259 from aws-lumberyard-dev/Prism/gem-db
Adding unit test for project properties cli
5 years ago
lumberyard-employee-dm fe441b01a0
Split the new_tags and delete_tags paramaters if they are strings on spaces. 5 years ago