atria-tools/island
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] select option deliver in manifest

Browse Source
This commit is contained in:
Edouard DUPIN 2019-08-27 23:23:10 +02:00
parent f9793383c6
commit 04019f5b0e
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
island/actions/islandAction_deliver-push.py
View File

@ -44,8 +44,6 @@ def add_specific_arguments(my_args, section):
## ##
def execute(_arguments): def execute(_arguments):
argument_remote_name = "" argument_remote_name = ""
destination_branch = "master"
source_branch = "develop"
for elem in _arguments: for elem in _arguments:
if elem.get_option_name() == "remote": if elem.get_option_name() == "remote":
debug.info("find remote name: '" + elem.get_arg() + "'") debug.info("find remote name: '" + elem.get_arg() + "'")
@ -56,7 +54,6 @@ def execute(_arguments):
# check system is OK # check system is OK
manifest.check_lutin_is_init() manifest.check_lutin_is_init()
configuration = config.get_unique_config() configuration = config.get_unique_config()
file_source_manifest = os.path.join(env.get_island_path_manifest(), configuration.get_manifest_name()) file_source_manifest = os.path.join(env.get_island_path_manifest(), configuration.get_manifest_name())
@ -64,6 +61,9 @@ def execute(_arguments):
debug.error("Missing manifest file : '" + str(file_source_manifest) + "'") debug.error("Missing manifest file : '" + str(file_source_manifest) + "'")
mani = manifest.Manifest(file_source_manifest) mani = manifest.Manifest(file_source_manifest)
destination_branch = mani.deliver_master
source_branch = mani.deliver_develop
all_project = mani.get_all_configs() all_project = mani.get_all_configs()
debug.info("fetch : " + str(len(all_project)) + " projects") debug.info("fetch : " + str(len(all_project)) + " projects")
id_element = 0 id_element = 0

6
island/actions/islandAction_deliver.py
View File

@ -45,8 +45,6 @@ def add_specific_arguments(_my_args, _section):
## ##
def execute(_arguments): def execute(_arguments):
argument_remote_name = "" argument_remote_name = ""
destination_branch = "master"
source_branch = "develop"
for elem in _arguments: for elem in _arguments:
debug.error("Wrong argument: '" + elem.get_option_name() + "' '" + elem.get_arg() + "'") debug.error("Wrong argument: '" + elem.get_option_name() + "' '" + elem.get_arg() + "'")
@ -61,6 +59,10 @@ def execute(_arguments):
mani = manifest.Manifest(file_source_manifest) mani = manifest.Manifest(file_source_manifest)
destination_branch = mani.deliver_master
source_branch = mani.deliver_develop
all_project = mani.get_all_configs() all_project = mani.get_all_configs()
debug.info("Check if all project are on master: " + str(len(all_project)) + " projects") debug.info("Check if all project are on master: " + str(len(all_project)) + " projects")
id_element = 0 id_element = 0

7
island/actions/islandAction_manifest-deliver-push.py
View File

@ -62,6 +62,11 @@ def execute(_arguments):
# Check the manifest is up to date ... # Check the manifest is up to date ...
base_display = tools.get_list_base_display(0, 0, elem) base_display = tools.get_list_base_display(0, 0, elem)
status.deliver_push(elem, "origin", "master", "develop", base_display) mani = manifest.Manifest(file_source_manifest)
destination_branch = mani.deliver_master
source_branch = mani.deliver_develop
status.deliver_push(elem, "origin", destination_branch, source_branch, base_display)

9
island/actions/islandAction_manifest-deliver.py
View File

@ -48,8 +48,6 @@ def add_specific_arguments(my_args, section):
## ##
def execute(_arguments): def execute(_arguments):
argument_remote_name = "" argument_remote_name = ""
destination_branch = "master"
source_branch = "develop"
for elem in _arguments: for elem in _arguments:
debug.error("pull Wrong argument: '" + elem.get_option_name() + "' '" + elem.get_arg() + "'") debug.error("pull Wrong argument: '" + elem.get_option_name() + "' '" + elem.get_arg() + "'")
@ -62,9 +60,13 @@ def execute(_arguments):
if os.path.exists(file_source_manifest) == False: if os.path.exists(file_source_manifest) == False:
debug.error("Missing manifest file : '" + str(file_source_manifest) + "'") debug.error("Missing manifest file : '" + str(file_source_manifest) + "'")
elem = configuration.get_manifest_config() elem = configuration.get_manifest_config()
mani = manifest.Manifest(file_source_manifest)
destination_branch = mani.deliver_master
source_branch = mani.deliver_develop
# Check the manifest is up to date ... # Check the manifest is up to date ...
base_display = tools.get_list_base_display(0, 0, elem) base_display = tools.get_list_base_display(0, 0, elem)
debug.verbose("deliver-ckeck: " + base_display) debug.verbose("deliver-ckeck: " + base_display)
@ -72,7 +74,6 @@ def execute(_arguments):
debug.error("Can not deliver a MANIFEST that is not ready to merge", crash=False) debug.error("Can not deliver a MANIFEST that is not ready to merge", crash=False)
return env.ret_action_fail return env.ret_action_fail
mani = manifest.Manifest(file_source_manifest)
all_tags = check_all_tags(mani) all_tags = check_all_tags(mani)
if all_tags == None: if all_tags == None: