diff --git a/builders.py b/builders.py index 5fbfbbb..5c8d978 100644 --- a/builders.py +++ b/builders.py @@ -145,7 +145,7 @@ def create_builder_factory(): name="Unpack shared repositories")) f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation)s/poky; git rev-parse HEAD"), - property="got_revision", + property="yp_build_revision", haltOnFailure=True, name='Set build revision')) @@ -215,6 +215,10 @@ factory.addStep(steps.ShellCommand( haltOnFailure=True, name="Unpack shared repositories")) +factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation)s/poky; git rev-parse HEAD"), + property="yp_build_revision", + haltOnFailure=True, + name='Set build revision')) # run-config factory.addStep(steps.ShellCommand( @@ -238,7 +242,7 @@ def get_props_set(): "is_release": util.Property("is_release"), "buildappsrcrev": "None", "deploy_artifacts": util.Property("deploy_artifacts"), - "publish_destination": util.Property("publish_destination") + "publish_destination": util.Property("publish_destination"), } for repo in config.repos: @@ -248,11 +252,6 @@ def get_props_set(): return set_props -factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:sharedrepolocation)s/poky; git rev-parse HEAD"), - property="got_revision", - haltOnFailure=True, - name='Set build revision')) - factory.addStep(steps.Trigger(schedulerNames=['wait'], waitForFinish=True, set_properties=get_props_set()))