From 523df98be64574e30473d9bb160a8e629d1847d4 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Tue, 28 Jun 2016 12:42:50 -0300 Subject: [PATCH] Bug Bug 1277838: Remove any reference to git.mozilla.org. r=garndt git.m.o will be gone, so we move repo caches to other repositories. Additionally, we remove the deprecated cache.js module. --- src/cache.js | 87 -------------------------------------------- src/cli/moz-cache.js | 6 +-- 2 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 src/cache.js diff --git a/src/cache.js b/src/cache.js deleted file mode 100644 index d040086..0000000 --- a/src/cache.js +++ /dev/null @@ -1,87 +0,0 @@ -import { Scheduler } from 'taskcluster-client'; - -import run from './run'; -import { generateCacheGraph, generateCloneTaskDefinition, generateRepoCacheTaskDefinition } from './task'; - -// import cache config - -async function main(argv) { - var clones = [ - 'https://github.com/walac/gecko-dev', - 'https://github.com/lightsofapollo/build-mozharness', - 'https://hg.mozilla.org/build/mozharness', - 'https://hg.mozilla.org/build/tools', - 'https://hg.mozilla.org/mozilla-central', - 'https://hg.mozilla.org/mozilla-central/', - 'https://hg.mozilla.org/integration/b2g-inbound/', - 'https://hg.mozilla.org/integration/b2g-inbound', - 'https://hg.mozilla.org/integration/mozilla-inbound', - 'https://hg.mozilla.org/integration/mozilla-inbound/', - 'https://hg.mozilla.org/integration/gaia', - 'https://hg.mozilla.org/integration/gaia/', - 'https://hg.mozilla.org/integration/gaia-2_5', - 'https://hg.mozilla.org/integration/gaia-2_5/', - 'https://hg.mozilla.org/integration/gaia-2_2r', - 'https://hg.mozilla.org/integration/gaia-2_2r/', - 'https://hg.mozilla.org/integration/fx-team/', - 'https://hg.mozilla.org/integration/fx-team', - 'https://git.mozilla.org/b2g/B2G.git', - 'https://hg.mozilla.org/integration/gaia-central', - 'https://hg.mozilla.org/integration/gaia-central/', - 'https://git.mozilla.org/b2g/B2G', - 'https://github.com/mozilla-b2g/gaia', - 'https://github.com/mozilla-b2g/B2G', - 'https://github.com/mozilla-b2g/B2G-manifest', - 'https://github.com/mozilla-b2g/moztt', - 'https://github.com/mozilla/gecko-dev', - 'https://git.mozilla.org/build/tooltool.git', - 'https://git.mozilla.org/external/google/gerrit/git-repo.git', - 'https://hg.mozilla.org/projects/alder', - 'https://hg.mozilla.org/projects/alder/', - 'https://hg.mozilla.org/releases/mozilla-b2g34_v2_1', - 'https://hg.mozilla.org/releases/mozilla-b2g34_v2_1/', - 'https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r', - 'https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r/', - 'https://hg.mozilla.org/releases/mozilla-b2g37_v2_2r/', - 'https://hg.mozilla.org/releases/mozilla-b2g44_v2_5', - 'https://hg.mozilla.org/releases/mozilla-b2g44_v2_5/', - 'https://hg.mozilla.org/releases/b2g-ota', - 'https://hg.mozilla.org/releases/b2g-ota/' -]; - - - var emulators = [ - ['emulator_url', 'emulator-ics'], - ['emulator_url', 'emulator'], - ['emulator_url', 'emulator-jb'], - ['emulator_url', 'emulator-kk'], - ['emulator_url', 'aries'], - ['emulator_url', 'nexus-5-l'], - ['emulator_url', 'emulator-l'], - ['g_emulator_url', 'emulator.xml'], - ['g_emulator_url', 'emulator-jb.xml'], - ['g_emulator_url', 'emulator-kk.xml'], - ['g_emulator_url', 'emulator-l.xml'] - ]; - - var scheduler = new Scheduler(); - var tasks = []; - - for (var url of clones) { - tasks.push(generateCloneTaskDefinition(url)); - } - - for (var emulator of emulators) { - tasks.push(generateRepoCacheTaskDefinition(emulator[1], emulator[0])); - } - - let {graphId, graph} = generateCacheGraph(tasks); - console.log(`Creating cache graph '${graphId}'`); - await scheduler.createTaskGraph(graphId, graph); -}; - -main(process.argv).catch((err) => { - console.log(JSON.stringify(err)); - process.exit(1); -}); - diff --git a/src/cli/moz-cache.js b/src/cli/moz-cache.js index f5abb7c..1c5d71c 100644 --- a/src/cli/moz-cache.js +++ b/src/cli/moz-cache.js @@ -43,17 +43,13 @@ export default async function main(config, argv) { 'https://hg.mozilla.org/integration/gaia-2_2r/', 'https://hg.mozilla.org/integration/fx-team/', 'https://hg.mozilla.org/integration/fx-team', - 'https://git.mozilla.org/b2g/B2G.git', 'https://hg.mozilla.org/integration/gaia-central', 'https://hg.mozilla.org/integration/gaia-central/', - 'https://git.mozilla.org/b2g/B2G', 'https://github.com/mozilla-b2g/gaia', 'https://github.com/mozilla-b2g/B2G', 'https://github.com/mozilla-b2g/B2G-manifest', 'https://github.com/mozilla-b2g/moztt', 'https://github.com/mozilla/gecko-dev', - 'https://git.mozilla.org/build/tooltool.git', - 'https://git.mozilla.org/external/google/gerrit/git-repo.git', 'https://hg.mozilla.org/projects/alder', 'https://hg.mozilla.org/projects/alder/', 'https://hg.mozilla.org/projects/cypress', @@ -209,7 +205,7 @@ function generateRepoCacheTaskDefinition(emulator, type) { var date = new Date(); var deadline = setDeadline(new Date(date.getTime()), 4); var repo = ''; - var B2GUrl = 'https://git.mozilla.org/b2g/B2G'; + var B2GUrl = 'https://github.com/mozilla-b2g/B2G'; if (type === 'emulator_url') { repo = ["https://hg.mozilla.org/mozilla-central/raw-file/default/b2g/config", emulator, "sources.xml"].join('/');