From 3758b8fe3ed520b37df58ea2b62fb9b56c9371db Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Tue, 6 Mar 2018 17:36:19 +0200
Subject: [PATCH] Backed out 3 changesets (bug 1436469) for Gecko Decision task
 failure. CLOSED TREE

Backed out changeset a03dea399278 (bug 1436469)
Backed out changeset 370c9dbdd572 (bug 1436369)
Backed out changeset b3b9609544ec (bug 1436369)

--HG--
rename : taskcluster/ci/repo-update-bb/kind.yml => taskcluster/ci/repo-update/kind.yml
---
 taskcluster/ci/repo-update-bb/kind.yml | 21 --------------
 taskcluster/ci/repo-update/kind.yml    | 40 ++++----------------------
 taskcluster/docs/kinds.rst             |  6 ----
 taskcluster/taskgraph/target_tasks.py  |  2 +-
 4 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 taskcluster/ci/repo-update-bb/kind.yml

diff --git a/taskcluster/ci/repo-update-bb/kind.yml b/taskcluster/ci/repo-update-bb/kind.yml
deleted file mode 100644
index 2c6576484eaa..000000000000
--- a/taskcluster/ci/repo-update-bb/kind.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-loader: taskgraph.loader.transform:loader
-
-transforms:
-   - taskgraph.transforms.job:transforms
-   - taskgraph.transforms.task:transforms
-
-
-jobs:
-   hsts-hpkp-blocklist:
-      name: periodic_file_update
-      description: HSTS, HPKP, and Blocklist update
-      worker-type: buildbot-bridge/buildbot-bridge
-      run-on-projects: []  # Only run via cron
-      run:
-         using: buildbot
-         product: firefox
-         buildername: Linux x86-64 {branch} periodic file update
diff --git a/taskcluster/ci/repo-update/kind.yml b/taskcluster/ci/repo-update/kind.yml
index 46a3572a8240..2c6576484eaa 100644
--- a/taskcluster/ci/repo-update/kind.yml
+++ b/taskcluster/ci/repo-update/kind.yml
@@ -5,6 +5,7 @@
 loader: taskgraph.loader.transform:loader
 
 transforms:
+   - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 
@@ -12,38 +13,9 @@ jobs:
    hsts-hpkp-blocklist:
       name: periodic_file_update
       description: HSTS, HPKP, and Blocklist update
+      worker-type: buildbot-bridge/buildbot-bridge
       run-on-projects: []  # Only run via cron
-      treeherder:
-         kind: build
-         platform: linux64/opt
-         symbol: pfu
-         tier: 1
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-      worker:
-         implementation: docker-worker
-         os: linux
-         docker-image: {in-tree: periodic-updates}
-         max-run-time: 3600  # Sometimes takes ~40 minutes
-         env:
-            DO_HSTS: "1"
-            DO_HPKP: "1"
-            DO_BLOCKLIST: "1"
-            USE_MOZILLA_CENTRAL: "1"
-            BRANCH: mozilla-central
-            PRODUCT: firefox
-            REVIEWERS: sfraser
-         command:
-            - /runme.sh
-         artifacts:
-            - name: 'public/build/nsSTSPreloadList.diff'
-              path: '/home/worker/artifacts/nsSTSPreloadList.diff'
-              type: file
-            - name: 'public/build/StaticHPKPins.h.diff'
-              path: '/home/worker/artifacts/StaticHPKPins.h.diff'
-              type: file
-            - name: 'public/build/blocklist.diff'
-              path: '/home/worker/artifacts/blocklist.diff'
-              type: file
-      scopes:
-         - secrets:get:project/releng/gecko/build/level-{level}/arc-phabricator-token
-
+      run:
+         using: buildbot
+         product: firefox
+         buildername: Linux x86-64 {branch} periodic file update
diff --git a/taskcluster/docs/kinds.rst b/taskcluster/docs/kinds.rst
index 46d4d3126af5..be42634c3abe 100644
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -366,12 +366,6 @@ repo-update
 Repo-Update tasks are tasks that perform some action on the project repo itself,
 in order to update its state in some way.
 
-repo-update-bb
---------------
-Repo-Update tasks are tasks that perform some action on the project repo itself,
-in order to update its state in some way. This kind is the older, buildbot version.
-It will be removed after the migration to taskcluster.
-
 partials
 --------
 Partials takes the complete.mar files produced in previous tasks and generates partial
diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index dd06fb0a93a9..1884d08125e3 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -621,5 +621,5 @@ def target_tasks_file_update(full_task_graph, parameters, graph_config):
     """
     def filter(task):
         # For now any task in the repo-update kind is ok
-        return task.kind in ['repo-update', 'repo-update-bb']
+        return task.kind in ['repo-update']
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]