From a7fa1752604d646bec1bef6516c9235e77d65fa1 Mon Sep 17 00:00:00 2001 From: Akshay Kumar Date: Sun, 18 Jan 2026 21:28:10 +0530 Subject: [PATCH 1/4] PythonFastBuildDisabled_UsesPipDirectly --- tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs b/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs index 8da9c64161..af19c9ef1a 100644 --- a/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs +++ b/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs @@ -1667,9 +1667,11 @@ public void PythonFastBuildDisabled_UsesPipDirectly() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is not enabled, using pip directly...", result.StdOut); + // When PYTHON_FAST_BUILD_ENABLED is not set, the build script uses pip directly Assert.Contains("Running pip install...", result.StdOut); - Assert.DoesNotContain("Installing uv...", result.StdOut); + // Verify fast build path was not taken + Assert.DoesNotContain("Fast build is enabled", result.StdOut); + Assert.DoesNotContain("Running uv pip install...", result.StdOut); }, result.GetDebugInfo()); } From ef165b2f5b634b148deb2aa263959e781c948a54 Mon Sep 17 00:00:00 2001 From: Akshay Kumar Date: Sun, 18 Jan 2026 21:34:59 +0530 Subject: [PATCH 2/4] fix NodeJsSampleAppsOtherTests.cs --- tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs b/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs index 6f0280e310..b1e947ab97 100644 --- a/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs +++ b/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs @@ -1003,8 +1003,9 @@ public void CanBuildAndRunNodeAppWithoutWorkspace_UsingYarn2ForBuild() var volume = DockerVolume.CreateMirror(Path.Combine(_hostSamplesDir, "nodejs", appName)); var appOutputDir = "/tmp/nextjs-yarn2-example"; var appDir = volume.ContainerDir; + // Next.js 14 requires Node.js >=18.17.0 var script = new ShellScriptBuilder() - .AddCommand($"oryx build {appDir} -o {appOutputDir}") + .AddBuildCommand($"{appDir} -o {appOutputDir} --platform {NodeConstants.PlatformName} --platform-version {NodeVersions.Node20Version}") .ToString(); // Act From 8daac8248181c9cea667d40ce6ef4b87645fdd0f Mon Sep 17 00:00:00 2001 From: Akshay Kumar Date: Sun, 18 Jan 2026 21:37:52 +0530 Subject: [PATCH 3/4] fix another tst --- tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs b/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs index b1e947ab97..b3b3d9cd68 100644 --- a/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs +++ b/tests/Oryx.BuildImage.Tests/Node/NodeJsSampleAppsOtherTests.cs @@ -969,12 +969,13 @@ public void CanBuildAndRunNodeApp_WithWorkspace_UsingYarn2ForBuild() var volume = DockerVolume.CreateMirror(Path.Combine(_hostSamplesDir, "nodejs", appName)); var appOutputDir = "/tmp/nextjs-yarn2-example"; var appDir = volume.ContainerDir; + // Next.js 14 requires Node.js >=18.17.0 var script = new ShellScriptBuilder() .AddCommand($"cd {appDir}") .AddCommand($"yarn set version berry") .AddCommand($"yarn plugin import workspace-tools@2.2.0") .AddCommand($"yarn set version 2.4.1") - .AddCommand($"oryx build . -o {appOutputDir}") + .AddBuildCommand($". -o {appOutputDir} --platform {NodeConstants.PlatformName} --platform-version {NodeVersions.Node20Version}") .ToString(); // Act From 891fd008734f06be27bacf8acde6254ce96fedf5 Mon Sep 17 00:00:00 2001 From: Akshay Kumar Date: Mon, 19 Jan 2026 02:54:29 +0530 Subject: [PATCH 4/4] fix integ tests --- .../Python/PythonSampleAppsTest.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs b/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs index af19c9ef1a..f616aa8967 100644 --- a/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs +++ b/tests/Oryx.BuildImage.Tests/Python/PythonSampleAppsTest.cs @@ -34,7 +34,7 @@ public void PipelineTestInvocationGithubActions() GeneratesScript_AndBuilds(imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBullseye)); JamSpell_CanBe_Installed_In_The_BuildImage(ImageTestHelperConstants.GitHubActionsBullseye); DoesNotGenerateCondaBuildScript_IfImageDoesNotHaveCondaInstalledInIt(ImageTestHelperConstants.GitHubActionsBullseye); - GeneratesScript_AndBuilds_WithCustomRequirementsTxt(ImageTestHelperConstants.GitHubActionsBullseye); + GeneratesScript_AndBuilds_WithCustomRequirementsTxt(imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBullseye)); } public void GeneratesScript_AndBuilds(string buildImageName) @@ -1632,7 +1632,7 @@ public void PythonFastBuildEnabled_UsesUvWithFallback() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is set to true, using uv pip with fallback...", result.StdOut); + Assert.Contains("Fast build is enabled", result.StdOut); Assert.Contains("Installing uv...", result.StdOut); Assert.Contains("Running uv pip install...", result.StdOut); }, @@ -1669,9 +1669,9 @@ public void PythonFastBuildDisabled_UsesPipDirectly() Assert.True(result.IsSuccess); // When PYTHON_FAST_BUILD_ENABLED is not set, the build script uses pip directly Assert.Contains("Running pip install...", result.StdOut); - // Verify fast build path was not taken + // Verify fast build path was not taken - "Fast build is enabled" should not appear Assert.DoesNotContain("Fast build is enabled", result.StdOut); - Assert.DoesNotContain("Running uv pip install...", result.StdOut); + Assert.DoesNotContain("Installing uv...", result.StdOut); }, result.GetDebugInfo()); } @@ -1715,7 +1715,7 @@ public void UvPipInstall_FallsBackToPip_WhenUvFails() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is set to true, using uv pip with fallback...", result.StdOut); + Assert.Contains("Fast build is enabled", result.StdOut); Assert.Contains("Installing uv...", result.StdOut); Assert.Contains("Running uv pip install...", result.StdOut); Assert.Contains("falling back to pip install", result.StdOut); @@ -1759,7 +1759,7 @@ public void UvPipInstall_UsesPreloadedWheelsDir_WhenProvided() () => { Assert.True(result.IsSuccess); - Assert.Contains("PYTHON_FAST_BUILD_ENABLED is set to true, using uv pip with fallback...", result.StdOut); + Assert.Contains("Fast build is enabled", result.StdOut); Assert.Contains($"Using preloaded wheels from: {wheelsDir}", result.StdOut); Assert.Contains("Running uv pip install...", result.StdOut); },