Skip to content

Commit

Permalink
Fixed call to data_url
Browse files Browse the repository at this point in the history
  • Loading branch information
yarunachalam committed Dec 4, 2024
1 parent ef0e0b0 commit b4d74b2
Showing 1 changed file with 12 additions and 15 deletions.
27 changes: 12 additions & 15 deletions tests/publiccloud/create_aistack_env.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,18 @@ use File::Basename;
use version_utils;
use Data::Dumper;

sub test_flags {
return {fatal => 1, publiccloud_multi_module => 1};
}

sub install_dependency_package {
my ($instance) = @_;
my $rke2_url = get_var('RKE2_URL');
my $kubectl_url = get_var('KUBECTL_URL');
my $helm_url = get_var('HELM_URL');

record_info('Dep pkg install');
trup_call("pkg install curl git docker");
trup_call("pkg install curl git docker python311");

# docker activation section
process_reboot(trigger => 1);
Expand All @@ -45,7 +49,7 @@ sub install_dependency_package {

# rke2 activation section
script_run("curl -sSL $rke2_url -o ./install_rke2.sh && chmod 775 ./install_rke2.sh");
script_run("sh ./install_rke2.sh");
script_run("sh ./install_rke2.sh | sh -");
script_run("echo 'export PATH=\$PATH:/opt/rke2/bin' >> ~/.bashrc");
systemctl("enable rke2-server.service");
systemctl("start rke2-server.service");
Expand Down Expand Up @@ -93,7 +97,7 @@ sub config_kubectl {
}

sub install_aistack_chart {
my ($instance, $ai_chart_repo, $namespace, $vf_name) = @_;
my ($instance, $namespace, $vf_name) = @_;
my $SECRET_application_collection = get_var('_SECRET_DOCKER');
my $cert_repo = get_var('HELM_CERTS');
my $ingress_repo = get_var('HELM_INGRESS');
Expand All @@ -116,12 +120,11 @@ sub install_aistack_chart {
my $gitlab_clone_url = 'https://git:' . $git_token . '@' . $repo_url;
assert_script_run("git clone $gitlab_clone_url");
assert_script_run("curl " . data_url("aistack/$vf_name") . " -o $vf_name", 60);
assert_script_run("curl -o $vf_name $ai_chart_repo", timeout => 120);

# local-path-storage.yaml is a copy off https://raw.githubusercontent.com/rancher/local-path-provisioner/v0.0.28/deploy/local-path-storage.yaml
assert_script_run("curl " . data_url("aistack/$local_storage_name") . " -o $local_storage_name", 60);
assert_script_run("kubectl apply -f $local_storage_name", timeout => 120);
assert_script_run("helm upgrade --install suse-private-ai private-ai-charts --namespace $namespace --create-namespace --values $vf_name --set open-webui.ingress.class=nginx", timeout => 600);
assert_script_run("helm upgrade --install suse-private-ai private-ai-charts --namespace $namespace --create-namespace --values $vf_name --set open-webui.ingress.class=nginx", timeout => 800);
assert_script_run("kubectl get all --namespace $namespace");
sleep 180;

Expand Down Expand Up @@ -210,7 +213,7 @@ sub test_openwebui_service {


sub install_nvidia_drivers {
my ($instance, $values_url, $file_name) = @_;
my ($instance, $file_name) = @_;
my $easyinstall_url = 'https://gitlab.nue.suse.com/cloud-solutions-sys-eng/nvidia-drivers-easy-install/-/blob/main/nvidia_easy_install.sh';
my $driver_version = '550.54.14';
my $gpu_op_url = get_var('GPU_OPERATOR');
Expand All @@ -225,8 +228,7 @@ sub install_nvidia_drivers {
trup_call("pkg install -y --auto-agree-with-licenses nvidia-open-driver-G06-signed-kmp=$driver_version nvidia-compute-utils-G06=$driver_version");

record_info('Install nvidia gpu operator');
assert_script_run("curl -o $file_name $values_url", timeout => 120);
#assert_script_run( "curl " . data_url("aistack/$file_name") . " -o $file_name", 60);
assert_script_run("curl " . data_url("aistack/$file_name") . " -o $file_name", 60);
assert_script_run("helm repo add $gpu_op_url", timeout => 600);
assert_script_run("helm repo update", timeout => 600);
assert_script_run("helm repo list", timeout => 600);
Expand All @@ -240,7 +242,6 @@ sub install_nvidia_drivers {

sub run {
my ($self, $args) = @_;
my $values_url = get_var('HELM_VALUES');
my $ai_ns = 'suse-private-ai';
my $value_file_name = '';

Expand All @@ -255,18 +256,14 @@ sub run {
# choose the correct values.yaml based on the test flavor
if (check_var('PUBLIC_CLOUD_NVIDIA_GPU_AISTACK', 1)) {
my $gpu_values = 'nvidia_gpu_values.yaml';
my $gpu_url = "$values_url";
$gpu_url .= "$gpu_values";
install_nvidia_drivers($instance, $gpu_url, $gpu_values);
install_nvidia_drivers($instance, $gpu_values);
$value_file_name = 'aistack_gpu_values.yaml';
$values_url .= "$value_file_name";
} else {
$values_url .= 'aistack_values.yaml';
$value_file_name = 'aistack_values.yaml';
}

# Install private_ai_stack chart
install_aistack_chart($instance, $values_url, $ai_ns, $value_file_name);
install_aistack_chart($instance, $ai_ns, $value_file_name);

# OpenWebUI service test
test_openwebui_service($instance, $ai_ns);
Expand Down

0 comments on commit b4d74b2

Please sign in to comment.