From 141401eb16789ea8e49db6d3c6d4cad8c1796949 Mon Sep 17 00:00:00 2001
From: Everett Pompeii <epompeii@protonmail.com>
Date: Mon, 30 Mar 2026 03:59:44 +0000
Subject: [PATCH] oci_url

---
 .github/workflows/deploy.yml               |  6 ----
 tasks/test_api/src/task/test/smoke_test.rs | 33 ++++++++++++++++++----
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d867d4d8f..9a8bb7b05 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -90,12 +90,6 @@ jobs:
         env:
           RUST_BACKTRACE: full
         run: cargo test-api smoke dev
-      - name: Run OCI Conformance Test
-        continue-on-error: true
-        timeout-minutes: 5
-        run: |
-          cargo test-api oci \
-          --url https://dev.registry.bencher.dev/
       - name: OCI Conformance Test Summary
         if: always()
         run: |
diff --git a/tasks/test_api/src/task/test/smoke_test.rs b/tasks/test_api/src/task/test/smoke_test.rs
index e1ba5f28c..57b4f9e39 100644
--- a/tasks/test_api/src/task/test/smoke_test.rs
+++ b/tasks/test_api/src/task/test/smoke_test.rs
@@ -7,8 +7,9 @@ use std::{
 };
 
 use bencher_json::{
-    BENCHER_API_PORT, DEV_BENCHER_API_URL, JsonApiVersion, Jwt, LOCALHOST_BENCHER_API_URL,
-    PROD_BENCHER_API_URL, TEST_BENCHER_API_URL, Url,
+    BENCHER_API_PORT, DEV_BENCHER_API_URL, DEV_BENCHER_REGISTRY_URL, JsonApiVersion, Jwt,
+    LOCALHOST_BENCHER_API_URL, LOCALHOST_BENCHER_REGISTRY_URL, PROD_BENCHER_API_URL,
+    PROD_BENCHER_REGISTRY_URL, TEST_BENCHER_API_URL, TEST_BENCHER_REGISTRY_URL, Url,
 };
 
 use crate::{
@@ -82,12 +83,14 @@ impl SmokeTest {
         };
 
         let api_url = self.environment.as_url();
+        let registry_url = self.environment.as_registry_url();
         test_api_version(&api_url)?;
 
         match self.environment {
             Environment::Ci => {
                 test(
                     &api_url,
+                    &registry_url,
                     MockSetup::SelfHosted {
                         examples: false,
                         runner: true,
@@ -98,6 +101,7 @@ impl SmokeTest {
             Environment::Localhost => {
                 test(
                     &api_url,
+                    &registry_url,
                     MockSetup::SelfHosted {
                         examples: true,
                         runner: false,
@@ -106,7 +110,7 @@ impl SmokeTest {
                 kill_child(child)?;
             },
             Environment::Docker => bencher_down()?,
-            Environment::Dev => test(&api_url, MockSetup::BencherCloud)?,
+            Environment::Dev => test(&api_url, &registry_url, MockSetup::BencherCloud)?,
             Environment::Test | Environment::Prod => {},
         }
 
@@ -124,6 +128,16 @@ impl Environment {
         }
         .into()
     }
+
+    fn as_registry_url(self) -> Url {
+        match self {
+            Self::Ci | Self::Localhost | Self::Docker => LOCALHOST_BENCHER_REGISTRY_URL.clone(),
+            Self::Dev => DEV_BENCHER_REGISTRY_URL.clone(),
+            Self::Test => TEST_BENCHER_REGISTRY_URL.clone(),
+            Self::Prod => PROD_BENCHER_REGISTRY_URL.clone(),
+        }
+        .into()
+    }
 }
 
 fn api_run() -> anyhow::Result<Child> {
@@ -205,7 +219,7 @@ enum MockSetup {
     SelfHosted { examples: bool, runner: bool },
 }
 
-fn test(api_url: &Url, mock_setup: MockSetup) -> anyhow::Result<()> {
+fn test(api_url: &Url, registry_url: &Url, mock_setup: MockSetup) -> anyhow::Result<()> {
     match mock_setup {
         MockSetup::BencherCloud => {
             let task = TaskSeedTest {
@@ -215,9 +229,16 @@ fn test(api_url: &Url, mock_setup: MockSetup) -> anyhow::Result<()> {
             };
             SeedTest::try_from(task)?.exec()?;
 
-            // Run runner smoke test (requires Docker + KVM for the runner daemon)
             #[cfg(feature = "plus")]
             {
+                // Run OCI conformance tests
+                let oci = Oci::try_from(TaskOci {
+                    url: Some(registry_url.clone()),
+                    ..Default::default()
+                })?;
+                oci.exec()?;
+
+                // Run runner smoke test (requires Docker + KVM for the runner daemon)
                 let runner_test = runner::RunnerTest::try_from(TaskRunner {
                     url: Some(api_url.clone()),
                     with_daemon: true,
@@ -239,7 +260,7 @@ fn test(api_url: &Url, mock_setup: MockSetup) -> anyhow::Result<()> {
             {
                 // Run OCI conformance tests
                 let oci = Oci::try_from(TaskOci {
-                    url: Some(api_url.clone()),
+                    url: Some(registry_url.clone()),
                     ..Default::default()
                 })?;
                 oci.exec()?;