Commit 197fbb6e authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

Backed out changeset d8122277e9fd (bug 1341214) for causing on m-c problems in vp tc tasks

parent 42bc96ae
Loading
Loading
Loading
Loading
+0 −7
Original line number Original line Diff line number Diff line
# 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/.

import os

GECKO = os.path.realpath(os.path.join(__file__, '..', '..', '..'))
+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ from .util import (
    calculate_head_rev
    calculate_head_rev
)
)
from ..create import create_task
from ..create import create_task
from .. import GECKO
from taskgraph.util.attributes import match_run_on_projects
from taskgraph.util.attributes import match_run_on_projects
from taskgraph.util.schema import resolve_keyed_by
from taskgraph.util.schema import resolve_keyed_by


@@ -33,6 +32,7 @@ JOB_TYPES = {
    'decision-task': decision.run_decision_task,
    'decision-task': decision.run_decision_task,
}
}


GECKO = os.path.realpath(os.path.join(__file__, '..', '..', '..', '..'))
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
_session = None
_session = None


+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ from .create import create_tasks
from .parameters import Parameters
from .parameters import Parameters
from .taskgraph import TaskGraph
from .taskgraph import TaskGraph
from actions import render_actions_json
from actions import render_actions_json
from . import GECKO


from taskgraph.util.templates import Templates
from taskgraph.util.templates import Templates
from taskgraph.util.time import (
from taskgraph.util.time import (
@@ -29,6 +28,7 @@ from taskgraph.util.time import (
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)


ARTIFACTS_DIR = 'artifacts'
ARTIFACTS_DIR = 'artifacts'
GECKO = os.path.realpath(os.path.join(__file__, '..', '..', '..'))


# For each project, this gives a set of parameters specific to the project.
# For each project, this gives a set of parameters specific to the project.
# See `taskcluster/docs/parameters.rst` for information on parameters.
# See `taskcluster/docs/parameters.rst` for information on parameters.
+1 −1
Original line number Original line Diff line number Diff line
@@ -18,8 +18,8 @@ from subprocess import Popen, PIPE
from io import BytesIO
from io import BytesIO


from taskgraph.util import docker
from taskgraph.util import docker
from . import GECKO


GECKO = os.path.realpath(os.path.join(__file__, '..', '..', '..'))
INDEX_URL = 'https://index.taskcluster.net/v1/task/' + docker.INDEX_PREFIX + '.{}.{}.hash.{}'
INDEX_URL = 'https://index.taskcluster.net/v1/task/' + docker.INDEX_PREFIX + '.{}.{}.hash.{}'
ARTIFACT_URL = 'https://queue.taskcluster.net/v1/task/{}/artifacts/{}'
ARTIFACT_URL = 'https://queue.taskcluster.net/v1/task/{}/artifacts/{}'


+3 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@
from __future__ import absolute_import, unicode_literals
from __future__ import absolute_import, unicode_literals


import logging
import logging
import os


from . import (
from . import (
    target_tasks,
    target_tasks,
@@ -12,6 +13,8 @@ from . import (


logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)


GECKO = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))

filter_task_functions = {}
filter_task_functions = {}




Loading