Merge pull request #502 from perftool-incubator/dev-kmr

Dev kmr

.github/workflows/crucible-ci.yaml

@@ -21,4 +21,4 @@ jobs:
       ci_target_branch: "${{ github.ref }}"
       github_workspace: "$GITHUB_WORKSPACE"
     secrets:
-      registry_auth: ${{ secrets.CRUCIBLE_CI_ENGINES_REGISTRY_AUTH }}
+      ci_registry_auth: ${{ secrets.CRUCIBLE_CI_ENGINES_REGISTRY_AUTH }}

.github/workflows/crucible-merged.yaml

@@ -0,0 +1,26 @@
+name: crucible-merged
+
+on:
+  pull_request_target:
+    types: [ closed ]
+    branches: [ master ]
+    paths-ignore:
+    - LICENSE
+    - '**.md'
+    - .github/workflows/faux-unittest.yaml
+    - .github/workflows/faux-crucible-ci.yaml
+    - 'docs/**'
+    - engine/engine-script-library.py
+    - engine/engine-script.py
+  workflow_dispatch:
+
+jobs:
+  call-core-crucible-ci_if-merged:
+    if: github.event.pull_request.merged == true
+    uses: perftool-incubator/crucible-ci/.github/workflows/core-crucible-ci.yaml@main
+    with:
+      ci_target: "rickshaw"
+      ci_target_branch: "master"
+      github_workspace: "$GITHUB_WORKSPACE"
+    secrets:
+      production_registry_auth: ${{ secrets.CRUCIBLE_PRODUCTION_ENGINES_REGISTRY_AUTH }}

rickshaw-run

@@ -118,6 +118,7 @@ my $roadblock_exit_abort_waiting = 6;
 my $abort_via_roadblock = 0;
 my $workshop_base_cmd;
 my $workshop_force_builds;
+my $quay_image_expiration;
 my $cs_conf_file;
 my %cs_conf;
 
@@ -1723,6 +1724,13 @@ sub load_settings_info() {
         print "load_settings_info(): failed to load workshop force\n";
         exit 1;
     }
+
+    ($rc, $quay_image_expiration) = get_json_setting("quay.image-expiration", $jsonsettings);
+    if ($rc != 0) {
+        print "load_settings_info(): failed to load quay image-expiration\n";
+        exit 1;
+    }
+
     printf "Finished loading json settings\n";
 }
 
@@ -2835,7 +2843,7 @@ $cs_conf_file = $config_dir . "/cs-conf.json";
                 },
                 'config' => {
                     'entrypoint' => [ "/bin/sh", "-c", "/usr/local/bin/bootstrap" ],
-                    'labels' => [ 'quay.expires-after=2w' ],
+                    'labels' => [ 'quay.expires-after=' . $quay_image_expiration ],
                     'envs' => [ 'TOOLBOX_HOME=/opt/toolbox' ]
                 }
             );

rickshaw-settings.json

@@ -21,5 +21,8 @@
     },
     "workshop": {
       "force-builds": "false"
+    },
+    "quay": {
+        "image-expiration": "2w"
     }
 }