Hlib Korzhynskyy has proposed merging
~hlibk/ubuntu-qa-tools:esm-private-change-nomenclature into
ubuntu-qa-tools:master.
Requested reviews:
Ubuntu Bug Control (ubuntu-bugcontrol)
For more details, see:
https://code.launchpad.net/~hlibk/ubuntu-qa-tools/+git/ubuntu-qa-tools/+merge/488405
This change adds esm-apps-private, and changes private-esm-infra to
esm-infra-private to maintain the standard from the dput configuration for
those PPAs.
--
Your team Ubuntu Bug Control is requested to review the proposed merge of
~hlibk/ubuntu-qa-tools:esm-private-change-nomenclature into
ubuntu-qa-tools:master.
diff --git a/security-tools/unembargo b/security-tools/unembargo
index 16c6528..de2ab45 100755
--- a/security-tools/unembargo
+++ b/security-tools/unembargo
@@ -35,10 +35,11 @@ UBUNTU_ARCHIVE = "ubuntu"
ESM_STAGING_PPA = "ubuntu-security/esm"
ESM_PRODUCTION_PPA = "ubuntu-esm/esm"
+ESM_APPS_PRIVATE_PPA ="ubuntu-esm/private-esm-infrastructure-security"
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_PRIVATE_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"
@@ -65,11 +66,15 @@ parser.add_argument("--esm-apps", help="Copy completed ESM packages from the "
"ESM Apps staging PPA to the ESM Apps production PPA "
"(default: None)", action='store_true',
default=None)
+parser.add_argument("--esm-apps-private", help="Copy completed ESM packages from the "
+ "Private ESM Apps PPA to the ESM Apps production PPA "
+ "(default: None)", action='store_true',
+ default=None)
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 "
+parser.add_argument("--esm-infra-private", help="Copy completed ESM packages from the "
"Private ESM Infra PPA to the ESM Infra production PPA "
"(default: None)", action='store_true',
default=None)
@@ -120,9 +125,12 @@ if opt.esm or opt.esm_apps or opt.private_esm_infra or opt.esm_infra or opt.esm_
elif opt.esm_infra:
opt.destination = ESM_INFRA_PRODUCTION_PPA
opt.ppa = ESM_INFRA_STAGING_PPA
- elif opt.private_esm_infra:
+ elif opt.esm_infra_private:
opt.destination = ESM_INFRA_PRODUCTION_PPA
- opt.ppa = PRIVATE_ESM_INFRA_PPA
+ opt.ppa = ESM_INFRA_PRIVATE_PPA
+ elif opt.esm_apps_private:
+ opt.destination = ESM_APPS_PRODUCTION_PPA
+ opt.ppa = ESM_APPS_PRIVATE_PPA
elif opt.esm_infra_legacy:
opt.destination = ESM_INFRA_LEGACY_PRODUCTION_PPA
opt.ppa = ESM_INFRA_LEGACY_STAGING_PPA
@@ -230,7 +238,9 @@ if potential_embargo:
# don't release security updates on Fridays
-if (opt.pocket == SECURITY_POCKET or opt.esm or opt.esm_apps or opt.private_esm_infra or opt.esm_infra or opt.esm_infra_legacy) and \
+if (opt.pocket == SECURITY_POCKET or \
+ opt.esm or opt.esm_apps or opt.esm_apps_private or \
+ opt.esm_infra or opt.esm_infra_private or opt.esm_infra_legacy) and \
datetime.datetime.today().weekday() == 4:
print("WARNING: The security team has a policy of not releasing security updates "
"on Fridays.")
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-bugcontrol
Post to : ubuntu-bugcontrol@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-bugcontrol
More help : https://help.launchpad.net/ListHelp
