From e5e50db1311942111a478193cd923d5c84a32f98 Mon Sep 17 00:00:00 2001 From: Gordon Hecker Date: Wed, 5 May 2010 14:41:16 +0200 Subject: [PATCH] deployment: move deployment settings to policy module Signed-off-by: Gordon Hecker --- local/e2build.lua | 7 +++---- local/policy.lua | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/local/e2build.lua b/local/e2build.lua index 02640f9..1d63154 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -1242,12 +1242,11 @@ function deploy(info, r, return_flags) table.insert(files, string.format("files/%s", f)) end table.insert(files, "checksums") - local server = "releases" - local location = string.format("%s/archive/%s/%s", info.project_location, - info.release_id, r) + local server, location = res.build_mode.deploy_storage(info.project_location, + info.release_id) for _,f in ipairs(files) do local sourcefile = string.format("result/%s", f) - local location1 = string.format("%s/%s", location, f) + local location1 = string.format("%s/%s/%s", location, r, f) local cache_flags = {} e2lib.logf(1, "result: %s deploying %s:%s", r, server, location1) local rc, re = info.cache:push_file(sourcefile, server, location1, diff --git a/local/policy.lua b/local/policy.lua index 397c9e8..823b9b0 100644 --- a/local/policy.lua +++ b/local/policy.lua @@ -54,6 +54,11 @@ function storage_local(location, release_id) return local_server, string.format("out") end +local releases_server = "releases" +function deploy_storage_default(location, release_id) + return releases_server, string.format("%s/archive/%s", location, + release_id) +end function dep_set_buildid(buildid) return buildid @@ -134,6 +139,7 @@ function init(info) storage_release, storage_default, storage_local, + deploy_storage_default, } for i,s in ipairs(storage) do local location = "test/test" @@ -253,6 +259,7 @@ policy.default_build_mode["release"] = { buildid = policy.buildid_buildid, storage = policy.storage_release, deploy = true, + deploy_storage = policy.deploy_storage_default, } policy.default_build_mode["branch"] = { -- 2.39.5