Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev kmr #504

Closed
wants to merge 3 commits into from
+27 −22
Closed

Dev kmr #504

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7778a1
remove extraneous file write
k-rister Jun 17, 2024
1b8e270
correct comment typo
k-rister Jun 17, 2024
f71bacf
modify the image builder to not include the quay image expiration lab…
k-rister Jun 17, 2024
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
49 changes: 27 additions & 22 deletions rickshaw-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,10 +579,6 @@ sub workshop_build_image {
printf "skip_update was not defined, so setting to false\n";
$skip_update = "false";
}
if (put_json_file($cs_conf_file, \%cs_conf) > 0) {
printf "workshop_build_image(): put_json_file(): %s: add failed\n", $cs_conf_file;
exit 1;
}
my $proj;
if (defined $run{'reg-proj'}) {
$proj = $run{'reg-host'} . "/" . $run{'reg-proj'};
Expand Down Expand Up @@ -914,7 +910,7 @@ sub source_container_image {
build_reqs(\@requirements, $userenv, $benchmark);

# First build a workshop-cmd args containing: (userenv_arg, req_args, tag), starting with the base userenv only (has no req_args),
# then each additional item in the list is a userenv arg mathcing the md5sum of the previous image, plus one more requirement.
# then each additional item in the list is a userenv arg matching the md5sum of the previous image, plus one more requirement.
# Keep adding to this list until @requirements is empty.
my @workshop_args;
my $userenv_arg;
Expand All @@ -935,7 +931,32 @@ sub source_container_image {
$req_arg = shift(@requirements);
$skip_update = "true";
}

# keep separate cs_conf_file contents before and after md5
# calculation so that the quay.io image expiration value is
# not factored into the image hash
%cs_conf = (
'workshop' => {
'schema' => {
'version' => '2020.04.30'
}
},
'config' => {
'entrypoint' => [ "/bin/sh", "-c", "/usr/local/bin/bootstrap" ],
'envs' => [ 'TOOLBOX_HOME=/opt/toolbox' ]
}
);
if (put_json_file($cs_conf_file, \%cs_conf) > 0) {
printf "put_json_file(): initial %s: failed\n", $cs_conf_file;
exit 1;
}
my $tag = calc_image_md5($workshop_base_cmd, $userenv_arg, $req_arg, $container_arch);
$cs_conf{'config'}{'labels'} = [ 'quay.expires-after=' . $quay_image_expiration ];
if (put_json_file($cs_conf_file, \%cs_conf) > 0) {
printf "put_json_file(): update %s: failed\n", $cs_conf_file;
exit 1;
}

my %args = ( 'userenv' => $userenv_arg, 'reqs' => $req_arg, 'tag' => $tag, 'skip-update' => $skip_update );
push (@workshop_args, \%args);

Expand Down Expand Up @@ -2834,25 +2855,9 @@ if ($run{'reg-auth'} eq "") {
printf "Disabling registry authorization due to empty 'reg-auth' variable\n";
$skip_registry_auth = 1;
}
$cs_conf_file = $config_dir . "/cs-conf.json";
%cs_conf = (
'workshop' => {
'schema' => {
'version' => '2020.04.30'
}
},
'config' => {
'entrypoint' => [ "/bin/sh", "-c", "/usr/local/bin/bootstrap" ],
'labels' => [ 'quay.expires-after=' . $quay_image_expiration ],
'envs' => [ 'TOOLBOX_HOME=/opt/toolbox' ]
}
);
if (put_json_file($cs_conf_file, \%cs_conf) > 0) {
printf "put_json_file(): %s: failed\n", $cs_conf_file;
exit 1;
}
build_test_order();
prepare_bench_tool_engines();
$cs_conf_file = $config_dir . "/cs-conf.json";
print "Preparing userenvs:\n";
debug_log (sprintf "image_ids (before):\n" . Dumper \%image_ids);
foreach my $bench_or_tool (sort (keys %image_ids)) {
Expand Down
Loading