From 050c8513c6aa84eef71f93e8a1d110896c47d73b Mon Sep 17 00:00:00 2001 From: Mihai Tabara Date: Thu, 21 Feb 2019 17:41:06 +0000 Subject: [PATCH 1/3] Fix ciadmin new home in scriptworker. --- scriptworker/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scriptworker/constants.py b/scriptworker/constants.py index 740e3927..f1e34971 100644 --- a/scriptworker/constants.py +++ b/scriptworker/constants.py @@ -124,7 +124,7 @@ "privkey_path": "...", "my_email": "scriptworker@example.com", - "project_configuration_url": "https://hg.mozilla.org/build/ci-configuration/raw-file/default/projects.yml", + "project_configuration_url": "https://hg.mozilla.org/ci/ci-configuration/raw-file/default/projects.yml", "pushlog_url": "{repo}/json-pushes?changeset={revision}&tipsonly=1&version=2&full=1", "chain_of_trust_hash_algorithm": "sha256", From 8086f6f7b3be2f97eb7cab9642067770b32c5b4a Mon Sep 17 00:00:00 2001 From: Mihai Tabara Date: Thu, 21 Feb 2019 17:45:59 +0000 Subject: [PATCH 2/3] Amend ci-admin and ci-configuration to reflect new home. --- scriptworker/cot/verify.py | 2 +- scriptworker/test/data/cotv4/projects.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scriptworker/cot/verify.py b/scriptworker/cot/verify.py index 3fc84100..0d899c63 100644 --- a/scriptworker/cot/verify.py +++ b/scriptworker/cot/verify.py @@ -1350,7 +1350,7 @@ def _wrap_action_hook_with_let(tmpl, action_perm): Given the content of .taskcluster.yml, construct the task template that would appear in the corresponding hook definition. This is an attempt to duplicate the logic here: - https://hg.mozilla.org/build/ci-admin/file/edad9f8/ciadmin/generate/in_tree_actions.py#l154 + https://hg.mozilla.org/ci/ci-admin/file/edad9f8/ciadmin/generate/in_tree_actions.py#l154 """ return { diff --git a/scriptworker/test/data/cotv4/projects.yml b/scriptworker/test/data/cotv4/projects.yml index 4cfb08d0..70352052 100644 --- a/scriptworker/test/data/cotv4/projects.yml +++ b/scriptworker/test/data/cotv4/projects.yml @@ -379,14 +379,14 @@ nss-try: taskcluster-push: true ci-configuration: - repo: https://hg.mozilla.org/build/ci-configuration + repo: https://hg.mozilla.org/ci/ci-configuration repo_type: hg access: scm_level_3 features: taskcluster-push: true ci-admin: - repo: https://hg.mozilla.org/build/ci-admin + repo: https://hg.mozilla.org/ci/ci-admin repo_type: hg access: scm_level_3 features: From ef10d250243e4879ed481c12a97f8ffaa6ec301d Mon Sep 17 00:00:00 2001 From: Mihai Tabara Date: Thu, 21 Feb 2019 17:53:32 +0000 Subject: [PATCH 3/3] 20.0.1 --- CHANGELOG.md | 4 ++++ version.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18cb397f..d971d75b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [20.0.1] - 2019-02-21 +### Changed +- update `ci-admin` and `ci-configuration` to reflect their new homes + ## [20.0.0] - 2019-02-21 ### Added - mobile can create in-tree docker images diff --git a/version.json b/version.json index e9717c82..995b8e7c 100644 --- a/version.json +++ b/version.json @@ -2,7 +2,7 @@ "version": [ 20, 0, - 0 + 1 ], - "version_string": "20.0.0" + "version_string": "20.0.1" }