Separate env parameter REF_USE_FOR_PRERELEASE

Change-Id: I84e68071635278025c2e50c85a62b993b1ef1241

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index 7f3e68e..4e99c27 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -157,7 +157,7 @@ def make_repo(project, repo, backenddb, base_url, base_path,
     # Set obs_target_prj to ref project if it is enabled
     basebuildid = None
     base_project = None
-    if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1":
+    if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1":
         if build_info.get('ref_obs_target_prj') and \
             ':ref:' in build_info.get('ref_obs_target_prj'):
             basebuildid = build_info.get('ref_obs_target_prj').split(':ref:')[1]
@@ -177,7 +177,7 @@ def make_repo(project, repo, backenddb, base_url, base_path,
 
     try:
         # Set obs_target_prj to ref project if it is enabled
-        if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1" and basebuildid:
+        if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1" and basebuildid:
             prerelease = snapshot.get_prerelease(base_url, tstamp, basebuildid)
             snapshot_path = prerelease.snapshot_path
         else:
@@ -263,7 +263,7 @@ def make_repo(project, repo, backenddb, base_url, base_path,
         repos.update(repomaker.repos)
 
         # Update ks files
-        if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1" and basebuildid:
+        if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1" and basebuildid:
             images_ks = update_ks(repomaker.imagedata, prerelease.snap_buildid,
                                   prerelease.pkg_urls(repo['Name']),
                                   base_project)

diff --git a/job_submit.py b/job_submit.py
index 4308e45..28c09a1 100755 (executable)
--- a/job_submit.py
+++ b/job_submit.py
@@ -749,11 +749,11 @@ def main(build_type, build, event, sr_count):
     # get project mappings from git-obs-mapping and git-ref-mapping
     if git_branch.endswith('_tpk'): # ABS - mappings w/o _tpk postfix(only for profiles).
         obs_target_prjs = git_obs_map(event['project'], git_branch.split('_tpk')[0])
-        if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1":
+        if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1":
             obs_ref_prjs = get_ref_map(event['project'], git_branch.split('_tpk')[0])
     else:
         obs_target_prjs = git_obs_map(event['project'], git_branch)
-        if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1":
+        if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1":
             obs_ref_prjs = get_ref_map(event['project'], git_branch)
 
     # Get all project lists
@@ -817,7 +817,7 @@ def main(build_type, build, event, sr_count):
 
             ref_obs_target_prj = obs_target_prj
             # Set obs_target_prj to ref project if it is enabled
-            if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1":
+            if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1":
                 # Check if this is the group submit.
                 existing_link_info = build.get_link_project_info(project)
                 if existing_link_info is not None and build.exists(existing_link_info):