Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public void BuildsApplication_IgnoresRuntimeVersionBasedSdkVersion_AndUsesSdkVer
result.GetDebugInfo());
}

[Fact, Trait("category", "githubactions")]
[Fact(Skip = "Dynamic installation images are not generated"), Trait("category", "githubactions")]
public void BuildsApplication_UsingPreviewVersionOfSdk()
{
// Arrange
Expand Down Expand Up @@ -334,7 +334,7 @@ public void BuildsApplication_UsingPreviewVersionOfSdk()
// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm),
ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsNoble),
EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
Expand Down Expand Up @@ -522,7 +522,7 @@ public static TheoryData<string, string, string, string> SupportedVersionAndImag
}
}

[Theory, Trait("category", "githubactions")]
[Theory(Skip = "Dynamic installation images are not generated"), Trait("category", "githubactions")]
[MemberData(nameof(SupportedVersionAndImageNameData))]
public void BuildsApplication_AfterInstallingSupportedSdk(
string runtimeVersion,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ private string GetSnippetToCleanUpExistingInstallation()
{
return $"rm -rf {DefaultInstallationRootDir}; mkdir -p {DefaultInstallationRootDir}";
}

[Fact, Trait("category", "githubactions")]
[Fact(Skip = "Go is no longer pre-installed in the GitHub Actions build image"), Trait("category", "githubactions")]
public void GithubActionsImageHasGoLangInstalled()
{
// Arrange
Expand Down
1 change: 1 addition & 0 deletions tests/Oryx.BuildImage.Tests/Hugo/HugoSampleAppsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------

using System;
using System.Collections.Generic;
using Microsoft.Oryx.BuildScriptGenerator.Common;
using Microsoft.Oryx.Tests.Common;
Expand Down
128 changes: 64 additions & 64 deletions tests/Oryx.BuildImage.Tests/Node/NodeJsMonorepoSampleAppsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,39 +21,39 @@ public NodeJsMonorepoSampleAppsTest(ITestOutputHelper output) : base(output)
private DockerVolume CreateSampleAppVolume(string sampleAppName) =>
DockerVolume.CreateMirror(Path.Combine(_hostSamplesDir, "nodejs", sampleAppName));

[Fact, Trait("category", "githubactions")]
public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Npm()
{
// Arrange
var appName = "monorepo-lerna-npm";
var volume = CreateSampleAppVolume(appName);
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/app1-output";
var script = new ShellScriptBuilder()
.SetEnvironmentVariable(
SettingsKeys.EnableNodeMonorepoBuild,
true.ToString())
.AddBuildCommand($"{appDir} -o {appOutputDir}")
.ToString();
// [Fact, Trait("category", "githubactions")]
// public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Npm()
// {
// // Arrange
// var appName = "monorepo-lerna-npm";
// var volume = CreateSampleAppVolume(appName);
// var appDir = volume.ContainerDir;
// var appOutputDir = "/tmp/app1-output";
// var script = new ShellScriptBuilder()
// .SetEnvironmentVariable(
// SettingsKeys.EnableNodeMonorepoBuild,
// true.ToString())
// .AddBuildCommand($"{appDir} -o {appOutputDir}")
// .ToString();

// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(),
EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
});
// // Act
// var result = _dockerCli.Run(new DockerRunArguments
// {
// ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm),
// EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
// Volumes = new List<DockerVolume> { volume },
// CommandToExecuteOnRun = "/bin/bash",
// CommandArguments = new[] { "-c", script }
// });

// Assert
RunAsserts(
() =>
{
Assert.True(result.IsSuccess);
},
result.GetDebugInfo());
}
// // Assert
// RunAsserts(
// () =>
// {
// Assert.True(result.IsSuccess);
// },
// result.GetDebugInfo());
// }


// This test is failing because for github actions the command manifest file is deleted. This command manifest file is preserved only for vso-focal and vso-debian-bullseye images.(check NodeBashBuildSnippet.sh.tpl line 235 to 250)
Expand Down Expand Up @@ -98,40 +98,40 @@ public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Npm()
// result.GetDebugInfo());
// }

[Fact, Trait("category", "githubactions")]
public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Yarn()
{
// Arrange
var appName = "monorepo-lerna-yarn";
var volume = CreateSampleAppVolume(appName);
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/app2-output";
var script = new ShellScriptBuilder()
.SetEnvironmentVariable(
SettingsKeys.EnableNodeMonorepoBuild,
true.ToString())
.AddBuildCommand($"{appDir} -o {appOutputDir}")
.AddDirectoryExistsCheck($"{appOutputDir}/node_modules/@babel")
.AddDirectoryExistsCheck($"{appOutputDir}/node_modules/universalify")
.ToString();
// [Fact, Trait("category", "githubactions")]
// public void GeneratesScript_AndBuildMonorepoAppUsingLerna_Yarn()
// {
// // Arrange
// var appName = "monorepo-lerna-yarn";
// var volume = CreateSampleAppVolume(appName);
// var appDir = volume.ContainerDir;
// var appOutputDir = "/tmp/app2-output";
// var script = new ShellScriptBuilder()
// .SetEnvironmentVariable(
// SettingsKeys.EnableNodeMonorepoBuild,
// true.ToString())
// .AddBuildCommand($"{appDir} -o {appOutputDir}")
// .AddDirectoryExistsCheck($"{appOutputDir}/node_modules/@babel")
// .AddDirectoryExistsCheck($"{appOutputDir}/node_modules/universalify")
// .ToString();

// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(),
EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
});
// // Act
// var result = _dockerCli.Run(new DockerRunArguments
// {
// ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm),
// EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
// Volumes = new List<DockerVolume> { volume },
// CommandToExecuteOnRun = "/bin/bash",
// CommandArguments = new[] { "-c", script }
// });

// Assert
RunAsserts(
() =>
{
Assert.True(result.IsSuccess);
},
result.GetDebugInfo());
}
// // Assert
// RunAsserts(
// () =>
// {
// Assert.True(result.IsSuccess);
// },
// result.GetDebugInfo());
// }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ public void GeneratesScript_AndBuilds_UsingSuppliedPackageDir()
result.GetDebugInfo());
}

[Fact, Trait("category", "githubactions")]
[Fact(Skip = "Lerna is not installed in the GitHub Actions build image"), Trait("category", "githubactions")]
public void GeneratesScript_AndBuilds_UsingSuppliedPackageDir_WhenPackageDirAndSourceDirAreSame()
{
// Arrange
Expand All @@ -719,7 +719,7 @@ public void GeneratesScript_AndBuilds_UsingSuppliedPackageDir_WhenPackageDirAndS
// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(),
ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm),
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
Expand Down Expand Up @@ -1010,7 +1010,7 @@ public void CanBuildAndRunNodeAppWithoutWorkspace_UsingYarn2ForBuild()
// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(),
ImageId = _imageHelper.GetGitHubActionsBuildImage(ImageTestHelperConstants.GitHubActionsBookworm),
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
Expand Down
132 changes: 66 additions & 66 deletions tests/Oryx.BuildImage.Tests/Python/CondaTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,77 +126,77 @@ public void CanBuildPython2AppHavingRequirementsTxtFile()
result.GetDebugInfo());
}

[Fact, Trait("category", "githubactions")]
public void CanBuildAppWithCondaEnviornmentYmlFileHavingPipPackages()
{
// Arrange
var appName = "python-conda_pip";
var volume = CreateCondaSampleAppVolume(appName);
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/app-output";
var script = new ShellScriptBuilder()
.AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv")
.AddDirectoryExistsCheck($"{appOutputDir}/venv")
// Following command makes sure that this package 'matplotlib' is present
.AddCommand("source /opt/conda/etc/profile.d/conda.sh")
.AddCommand($"conda activate {appOutputDir}/venv")
.AddCommand("pip show matplotlib")
.ToString();
// [Fact, Trait("category", "githubactions")]
// public void CanBuildAppWithCondaEnviornmentYmlFileHavingPipPackages()
// {
// // Arrange
// var appName = "python-conda_pip";
// var volume = CreateCondaSampleAppVolume(appName);
// var appDir = volume.ContainerDir;
// var appOutputDir = "/tmp/app-output";
// var script = new ShellScriptBuilder()
// .AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv")
// .AddDirectoryExistsCheck($"{appOutputDir}/venv")
// // Following command makes sure that this package 'matplotlib' is present
// .AddCommand("source /opt/conda/etc/profile.d/conda.sh")
// .AddCommand($"conda activate {appOutputDir}/venv")
// .AddCommand("pip show matplotlib")
// .ToString();

// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(),
EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
});
// // Act
// var result = _dockerCli.Run(new DockerRunArguments
// {
// ImageId = _imageHelper.GetGitHubActionsBuildImage(),
// EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
// Volumes = new List<DockerVolume> { volume },
// CommandToExecuteOnRun = "/bin/bash",
// CommandArguments = new[] { "-c", script }
// });

// Assert
RunAsserts(
() =>
{
Assert.True(result.IsSuccess);
},
result.GetDebugInfo());
}
// // Assert
// RunAsserts(
// () =>
// {
// Assert.True(result.IsSuccess);
// },
// result.GetDebugInfo());
// }

[Fact, Trait("category", "githubactions")]
public void CanBuildJuliaPythonSampleApp()
{
// Arrange
var appName = "julia-python";
var volume = CreateCondaSampleAppVolume(appName);
var appDir = volume.ContainerDir;
var appOutputDir = "/tmp/app-output";
var script = new ShellScriptBuilder()
.AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv")
.AddDirectoryExistsCheck($"{appOutputDir}/venv")
// Following command makes sure that this package 'matplotlib' is present
.AddCommand("source /opt/conda/etc/profile.d/conda.sh")
.AddCommand($"conda activate {appOutputDir}/venv")
.AddCommand("pip show julia")
.ToString();
// [Fact, Trait("category", "githubactions")]
// public void CanBuildJuliaPythonSampleApp()
// {
// // Arrange
// var appName = "julia-python";
// var volume = CreateCondaSampleAppVolume(appName);
// var appDir = volume.ContainerDir;
// var appOutputDir = "/tmp/app-output";
// var script = new ShellScriptBuilder()
// .AddBuildCommand($"{appDir} -o {appOutputDir} -p virtualenv_name=venv")
// .AddDirectoryExistsCheck($"{appOutputDir}/venv")
// // Following command makes sure that this package 'matplotlib' is present
// .AddCommand("source /opt/conda/etc/profile.d/conda.sh")
// .AddCommand($"conda activate {appOutputDir}/venv")
// .AddCommand("pip show julia")
// .ToString();

// Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetGitHubActionsBuildImage(),
EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
Volumes = new List<DockerVolume> { volume },
CommandToExecuteOnRun = "/bin/bash",
CommandArguments = new[] { "-c", script }
});
// // Act
// var result = _dockerCli.Run(new DockerRunArguments
// {
// ImageId = _imageHelper.GetGitHubActionsBuildImage(),
// EnvironmentVariables = new List<EnvironmentVariable> { CreateAppNameEnvVar(appName) },
// Volumes = new List<DockerVolume> { volume },
// CommandToExecuteOnRun = "/bin/bash",
// CommandArguments = new[] { "-c", script }
// });

// Assert
RunAsserts(
() =>
{
Assert.True(result.IsSuccess);
},
result.GetDebugInfo());
}
// // Assert
// RunAsserts(
// () =>
// {
// Assert.True(result.IsSuccess);
// },
// result.GetDebugInfo());
// }

[Fact(Skip = "Skipping test temporarily"), Trait("category", "vso-focal")]
public void CanBuildJupiterRiseApp()
Expand Down
Loading
Loading