deployment: policy: enable deployment in release mode only

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/local/e2build.lua b/local/e2build.lua
index 3f59c0d1af1c7405127f19879763f5ab393fa6e7..5ce6452bf8ad64371cfae1f4672750270739478b 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -1228,6 +1228,11 @@ function deploy(info, r, return_flags)
   -- result/files/*
   --   -> releases:<project>/<archive>/<release_id>/<result>/files/*
 --]]
+  local res = info.results[r]
+  if not res.build_mode.deploy then
+    e2lib.logf(1, "deployment disabled for this build mode")
+    return true
+  end
   local files = {}
   for f in e2lib.directory("result/files") do
     table.insert(files, string.format("files/%s", f))

diff --git a/local/policy.lua b/local/policy.lua
index 0ac8dc2c4c937ddeda6c5a75657518fe33d16de3..397c9e867707565fc064420d191ab3493741ae14 100644 (file)
--- a/local/policy.lua
+++ b/local/policy.lua
@@ -236,6 +236,7 @@ policy.default_build_mode["lazytag"] = {
        dep_set = policy.dep_set_buildid,
        buildid = policy.buildid_buildid,
        storage = policy.storage_default,
+       deploy = false,
 }
 
 policy.default_build_mode["tag"] = {
@@ -243,6 +244,7 @@ policy.default_build_mode["tag"] = {
        dep_set = policy.dep_set_buildid,
        buildid = policy.buildid_buildid,
        storage = policy.storage_default,
+       deploy = false,
 }
 
 policy.default_build_mode["release"] = {
@@ -250,6 +252,7 @@ policy.default_build_mode["release"] = {
        dep_set = policy.dep_set_buildid,
        buildid = policy.buildid_buildid,
        storage = policy.storage_release,
+       deploy = true,
 }
 
 policy.default_build_mode["branch"] = {
@@ -257,6 +260,7 @@ policy.default_build_mode["branch"] = {
        dep_set = policy.dep_set_buildid,
        buildid = policy.buildid_buildid,
        storage = policy.storage_default,
+       deploy = false,
 }
 
 policy.default_build_mode["working-copy"] = {
@@ -264,4 +268,5 @@ policy.default_build_mode["working-copy"] = {
        dep_set = policy.dep_set_last,
        buildid = policy.buildid_scratch,
        storage = policy.storage_local,
+       deploy = false,
 }