Univention Bugzilla – Bug 45303
Integrate ucs-ec2-tools package as Git submodule
Last modified: 2018-03-15 08:27:14 CET
As discussed with Philipp, ucs-ec2-tools will be a separate Git repository. This leads to the question how it will be integrated into our UCS Git repository. The current suggestion is that we clean up the structure now (as jenkins scripts need to be adapted anyhow) as follows: * test/ucs-ec2-tools/examples/jenkins/ will be moved to test/scenarios-ec2 * test/ucs-ec2-tools/examples/kvm/ will be moved to test/scenarios-kvm * test/ucs-ec2-tools/examples/jenkins/utils/utils.sh will be moved to the ucs-ec2-tools repository (as it is used by ec2 and jenkins scenarios) * The remaining ucs-ec2-tools directory can then be removed * ucs-ec2-tools will be added as submodule below test/
(In reply to Alexander Kläser from comment #0) > As discussed with Philipp, ucs-ec2-tools will be a separate Git repository. > This leads to the question how it will be integrated into our UCS Git > repository. The current suggestion is that we clean up the structure now (as > jenkins scripts need to be adapted anyhow) as follows: > > * test/ucs-ec2-tools/examples/jenkins/ will be moved to test/scenarios-ec2 > * test/ucs-ec2-tools/examples/kvm/ will be moved to test/scenarios-kvm > * test/ucs-ec2-tools/examples/jenkins/utils/utils.sh will be moved to the > ucs-ec2-tools repository (as it is used by ec2 and jenkins scenarios) > * The remaining ucs-ec2-tools directory can then be removed > * ucs-ec2-tools will be added as submodule below test/ One suggestion: The current ucs-ec2-tools/examples/jenkins/utils/ directory is UCS version specific (schoolinstaller.py, base_appliance.sh ...) and should be part of ucs repo (maybe test/scenarios-utils) not ucs-ec2-tools. ucs-ec2-tools/utils should be removed instead ucs-ec2-tools/shared-utils can be used for version unspecific test tools.
Final structure is as follows: test/ucs-ec2-tools → submodule reference to ucs-ec2-tools repository test/scenarios → all files from test/ucs-ec2-tools/examples/ and test/ucs-ec2-tools/ucs/*/ test/scenarios/ipv6 → all files from test/ucs-ec2-tools/examples/kvm/prod I committed these changes to all branches from 3.2-0 onwards in order to make sure that one does not have any problems when switching from one branch to another one (the ucs-ec2-tools submodule is conflicting with the previous content in test/ucs-ec2-tools).
OK utils/ got moved to /tests/ by Bug #41437 FIXED: 093b179..d244b72 ucs-ec2-change-ami 12760d9a93b6030a97cb86ccb1090abfa376ea70 Track ucs-ec2-tools master
Nothing to release.