ubuntu-bugcontrol team mailing list archive

["Leonidas S. Barbosa" <mp+487235@xxxxxxxxxxxxxxxxxx>]

Leonidas S. Barbosa has proposed merging ubuntu-qa-tools:adding_private_esm into ubuntu-qa-tools:master.

Commit message:
Adding private-esm-infra option to unembargo script

Requested reviews:
  Paulo Flabiano Smorigo (pfsmorigo)

For more details, see:
https://code.launchpad.net/~ubuntu-bugcontrol/ubuntu-qa-tools/+git/ubuntu-qa-tools/+merge/487235

Adding private-esm-infra option to unembargo script
-- 
Your team Ubuntu Bug Control is subscribed to branch ubuntu-qa-tools:master.

diff --git a/security-tools/unembargo b/security-tools/unembargo
index e2d8536..2538ac5 100755
--- a/security-tools/unembargo
+++ b/security-tools/unembargo
@@ -38,6 +38,7 @@ ESM_PRODUCTION_PPA = "ubuntu-esm/esm"
 ESM_APPS_STAGING_PPA = "ubuntu-esm/esm-apps-security-staging"
 ESM_APPS_PRODUCTION_PPA = "ubuntu-esm/esm-apps-security"
 
+PRIVATE_ESM_INFRA_PPA ="ubuntu-esm/private-esm-infrastructure-security"
 ESM_INFRA_STAGING_PPA = "ubuntu-esm/esm-infra-security-staging"
 ESM_INFRA_PRODUCTION_PPA = "ubuntu-esm/esm-infra-security"
 
@@ -68,6 +69,10 @@ parser.add_argument("--esm-infra", help="Copy completed ESM packages from the "
                     "ESM Infra staging PPA to the ESM Infra production PPA "
                     "(default: None)", action='store_true',
                     default=None)
+parser.add_argument("--private-esm-infra", help="Copy completed ESM packages from the "
+                    "Private ESM Infra PPA to the ESM Infra production PPA "
+                    "(default: None)", action='store_true',
+                    default=None)
 parser.add_argument("--esm-infra-legacy", help="Copy completed ESM packages from the "
                     "ESM Infra Legacy staging PPA to the ESM Infra Legacy production PPA "
                     "(default: None)", action='store_true',
@@ -103,7 +108,7 @@ if len(args) < 1:
 # If --esm, --esm-apps, --esm-infra, or --esm-infra-legacy option is provided,
 # the script will move from the respective ESM staging PPA to the respective
 # ESM PROD PPA. So the user should not indicate such values.
-if opt.esm or opt.esm_apps or opt.esm_infra or opt.esm_infra_legacy:
+if opt.esm or opt.esm_apps or opt.private_esm_infra or opt.esm_infra or opt.esm_infra_legacy:
     if opt.destination != UBUNTU_ARCHIVE or opt.ppa is not None or opt.pocket is not None:
         parser.error("If an esm option is provided, do not specify values for "
                      "package origin, destination, and pocket as this "
@@ -115,6 +120,9 @@ if opt.esm or opt.esm_apps or opt.esm_infra or opt.esm_infra_legacy:
     elif opt.esm_infra:
         opt.destination = ESM_INFRA_PRODUCTION_PPA
         opt.ppa = ESM_INFRA_STAGING_PPA
+    elif opt.private_esm_infra:
+        opt.destination = ESM_INFRA_PRODUCTION_PPA
+        opt.ppa = PRIVATE_ESM_INFRA_PPA
     elif opt.esm_infra_legacy:
         opt.destination = ESM_INFRA_LEGACY_PRODUCTION_PPA
         opt.ppa = ESM_INFRA_LEGACY_STAGING_PPA