Replaced pre-release with prerelease

According to http://dictionary.reference.com/,
http://www.thefreedictionary.com/ and other sources of information
pre-release is incorrect word. Prerelease(without '-') should be used
instead.

Change-Id: If763bd0aea0f259a847e7b66aeba7b966633f468
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Reviewed-on: https://otctools.jf.intel.com/review/6441
Tested-by: OTC Tools Tester <ed.bartosh@linux.intel.com>
Reviewed-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/common/buildservice.py b/common/buildservice.py
index 3831991..babde24 100644 (file)
--- a/common/buildservice.py
+++ b/common/buildservice.py
@@ -482,7 +482,7 @@ class BuildService(OSC):
             return {}
 
     def cleanup(self, obs_project, msg):
-        """Remove pre-release OBS project."""
+        """Remove prerelease OBS project."""
         if self.exists(obs_project):
             return self.delete_project(obs_project, force=True, msg=msg)
 

diff --git a/common/prerelease.py b/common/prerelease.py
index 39ff5fb..6691a9b 100644 (file)
--- a/common/prerelease.py
+++ b/common/prerelease.py
@@ -2,7 +2,7 @@
 # vim: ai ts=4 sts=4 et sw=4
 
 """
-APIs used in pre-release scripts.
+APIs used in prerelease scripts.
 """
 
 import os

diff --git a/job_pre_release_gerrit.py b/job_pre_release_gerrit.py
index b61ea49..e910afb 100755 (executable)
--- a/job_pre_release_gerrit.py
+++ b/job_pre_release_gerrit.py
@@ -50,7 +50,7 @@ def git_obs_map(gerrit_prj, gerrit_branch):
 
 def create(git_url, git_project, git_tag, git_revision, build,
            obs_target_prj, obs_project):
-    """Create pre-release OBS project and upload sources for the build."""
+    """Create prerelease OBS project and upload sources for the build."""
 
     # Create review project if it doesn't exist
     print "Creating temporary review OBS project %s" % obs_project
@@ -82,7 +82,7 @@ def create(git_url, git_project, git_tag, git_revision, build,
 
     # Upload _service file to the project for gbs source service
     print "Uploading service file"
-    commit_message = 'uploaded by pre-release job to build %s/%s(%s)' % \
+    commit_message = 'uploaded by prerelease job to build %s/%s(%s)' % \
                       (git_project, git_tag, git_revision)
     content = "<services><service name='gbs'><param name='revision'>%s</param>"\
               "<param name='url'>%s</param></service></services>" % \

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index 86040af..3cbe1c7 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -25,7 +25,7 @@ class LocalError(Exception):
 def get_prerelease_data(backenddb, base_url, base_path='/srv/download',
                         repo_name=None, obs_project=None, tstamp=None):
     """
-    Return all info about repos, required by pre-release from backend database.
+    Return all info about repos, required by prerelease from backend database.
 
     Args:
     backenddb: BackendDB object
@@ -33,7 +33,7 @@ def get_prerelease_data(backenddb, base_url, base_path='/srv/download',
     base_url: base url of the repo
     repo_name: repository name (tizen, tizen:ivi, etc)
     obs_project: OBS project name: (Tizen:Main, Tizen:IVI, etc)
-    tstamp: pre-release time stamp
+    tstamp: prerelease time stamp
     """
 
     try:
@@ -129,7 +129,7 @@ def trigger_image_creation(images_ks, build_id, path_repo, project, url_pub_base
         Prepare the data and trigger the image_creation jobs
     Args:
          images_ks (truple list): [(ks_file_name, ks_file_content),]
-         build_id (str): the pre-release repo build_id
+         build_id (str): the prerelease repo build_id
     """
     for index, (ksname, kickstart) in enumerate(images_ks.items()):
         name = ksname.replace('.ks', '')
@@ -149,7 +149,7 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base):
     make repo.
 
     Args:
-        project (str): OBS pre-release project name
+        project (str): OBS prerelease project name
         repo (str): name of the OBS live repository
         backenddb (BackendDB): backenddb instance
     Raises:
@@ -183,7 +183,7 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base):
         # repomaker did not found image-configurations in pre_release repo,
         # let's take it from target repo, only one package repo is enough
 
-        # Add image configuration to pre-release repo
+        # Add image configuration to prerelease repo
         for rpm in find_files(data['snapshot_path'],
                               prefix="image-configurations-",
                               suffix='noarch.rpm'):
@@ -221,7 +221,7 @@ def get_published_repo(repo_path_base, time_stamp):
 
 def project_cleanup(backenddb, build, base_url, event_dict):
     """ request(SR) end of life, this founction should be called to
-    delete the pre-release project """
+    delete the prerelease project """
 
     # Event is from project delted
     if "project" in event_dict:
@@ -258,7 +258,7 @@ def project_cleanup(backenddb, build, base_url, event_dict):
     # Delete the prerelease project
     build.cleanup(prerelease_project_name, "Cleaned up by backend automaticly")
 
-    # Get pre-release data from db
+    # Get prerelease data from db
     data = get_prerelease_data(backenddb, base_url,
                                obs_project=target_project)
 
@@ -311,7 +311,7 @@ def main(name, action):
         make_repo(project, repo, backenddb, base_url, base_path, live_repo_base)
     elif action == 'cleanup':
         # request(SR) end of life, this founction should be called to
-        # delete the pre-release project "
+        # delete the prerelease project "
         project_cleanup(backenddb, build, base_url, content)
     else:
         raise LocalError("Not supported method of pre_release_obs job: %s" \