[orion-builder] Run CI in PR 521 with asuleimanov docker.io builder/d…

…ecision images
MozillaSecurity · Oct 29, 2024 · 3f14188 · 3f14188
1 parent 90f6588
commit 3f14188
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -27,10 +27,11 @@ tasks:
             - "pipefail"
             - >
               retry () { for _ in {1..9}; do if "$@"; then return; else sleep 30; fi; done; "$@"; };
-              retry podman pull mozillasecurity/orion-decision:latest;
+              retry podman pull asuleimanov/orion-decision:latest;
               podman run --rm -e TASK_ID -e RUN_ID -e TASKCLUSTER_ROOT_URL --add-host=taskcluster:127.0.0.1 --net=host
               -e TASKCLUSTER_PROXY_URL=http://localhost:80 -e DOCKER_HUB_SECRET -e GITHUB_EVENT -e GITHUB_ACTION -e TASKCLUSTER_NOW
-              mozillasecurity/orion-decision:latest decision -v
+              asuleimanov/orion-decision:latest decision -v
+              # TODO: change dockerhub repo back to mozillasecurity
       scopes:
         - docker-worker:capability:privileged
         - index:insert-task:project.fuzzing.orion.*

diff --git a/services/orion-builder/src/orion_builder/build.py b/services/orion-builder/src/orion_builder/build.py
@@ -113,7 +113,8 @@ def sanity_check(self, args: argparse.Namespace) -> None:
 def main(argv: Optional[List[str]] = None) -> None:
     """Build entrypoint. Does not return."""
     args = BuildArgs.parse_args(argv)
-    base_tag = "latest"
+    # base_tag = "latest"
+    base_tag = "pr521"  # TODO: change back in master
     arch = {"x86_64": "amd64", "aarch64": "arm64"}.get(machine(), machine())
     assert arch == args.arch
     args.tag = [f"{args.git_revision}-{arch}", base_tag, f"{base_tag}-{arch}"]

diff --git a/services/orion-builder/src/orion_builder/combine.py b/services/orion-builder/src/orion_builder/combine.py
@@ -96,11 +96,12 @@ def main(argv: Optional[List[str]] = None) -> None:
     """Combine entrypoint. Does not return."""
 
     args = CombineArgs.parse_args(argv)
-    configure_logging(level=args.log_level)
+    # configure_logging(level=args.log_level)  # TODO: change back
+    configure_logging(level=0)  # for debugging
 
     service_name = args.service_name
     archs = args.archs
-    base_tag = "latest"
+    base_tag = "pr521"  # TODO: change back to latest in master
 
     config = Configuration(argparse.Namespace(secret=None, config=None))
     queue = taskcluster.Queue(config.get_taskcluster_options())

diff --git a/services/orion-builder/src/orion_builder/push.py b/services/orion-builder/src/orion_builder/push.py
@@ -81,8 +81,10 @@ def sanity_check(self, args: argparse.Namespace) -> None:
 def main(argv: Optional[List[str]] = None) -> None:
     """Push entrypoint. Does not return."""
     args = PushArgs.parse_args(argv)
-    configure_logging(level=args.log_level)
-    base_tag = "latest"
+    # configure_logging(level=args.log_level)  # TODO: change back
+    configure_logging(level=10)  # for debugging
+    # base_tag = "latest"
+    base_tag = "pr521"  # TODO: change back to latest in master
 
     config = Configuration(args)
     queue = taskcluster.Queue(config.get_taskcluster_options())

diff --git a/services/orion-decision/src/orion_decision/task_templates/build.yaml b/services/orion-decision/src/orion_decision/task_templates/build.yaml
@@ -26,7 +26,8 @@ payload:
     LOAD_DEPS: "${load_deps}"
   capabilities:
     privileged: true
-  image: "mozillasecurity/orion-builder:latest"
+  # image: "mozillasecurity/orion-builder:latest"
+  image: "asuleimanov/orion-builder:latest"  # TODO: change back
   maxRunTime: !!int "${max_run_time}"
 routes:
   - "index.project.fuzzing.orion.${service_name}.rev.${commit}"

diff --git a/services/orion-decision/src/orion_decision/task_templates/combine.yaml b/services/orion-decision/src/orion_decision/task_templates/combine.yaml
@@ -25,7 +25,9 @@ payload:
     ARCHS: "${archs}"
   capabilities:
     privileged: true
-  image: "mozillasecurity/orion-builder:latest"
+  #image: "mozillasecurity/orion-builder:latest"
+  # TODO: change back to mozillasecurity once approved
+  image: "asuleimanov/orion-builder:latest"
   maxRunTime: !!int "${max_run_time}"
 routes:
   - "index.project.fuzzing.orion.${service_name}.rev.${commit}"

diff --git a/services/orion-decision/src/orion_decision/task_templates/push.yaml b/services/orion-decision/src/orion_decision/task_templates/push.yaml
@@ -21,7 +21,8 @@ payload:
     privileged: true
   features:
     taskclusterProxy: true
-  image: "mozillasecurity/orion-builder:latest"
+  # image: "mozillasecurity/orion-builder:latest"
+  image: "asuleimanov/orion-builder:latest"  # TODO: change back
   maxRunTime: !!int "${max_run_time}"
 scopes:
   - "docker-worker:capability:privileged"