Skip to content

Commit

Permalink
Merge pull request #312 from MihaiTabara/ciswitch
Browse files Browse the repository at this point in the history
Fix ci-{admin,configuration} new home in scriptworker.
  • Loading branch information
escapewindow committed Feb 21, 2019
2 parents 31a1062 + ef10d25 commit dc088ba
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scriptworker/constants.py
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scriptworker/cot/verify.py
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions scriptworker/test/data/cotv4/projects.yml
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions version.json
Expand Up @@ -2,7 +2,7 @@
"version": [
20,
0,
0
1
],
"version_string": "20.0.0"
"version_string": "20.0.1"
}

0 comments on commit dc088ba

Please sign in to comment.