Merge "Replace the root command with user mode"

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index 217736d..33f7f00 100644 (file)
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -268,6 +268,8 @@
             # Not sure if it would be better to use "change-merged" here and just clone the master
             # branch. With the current approach the SCM can be identical in verify and merge jobs.
             - ref-updated-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'

diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml
index 2484ccb..f0e868b 100644 (file)
--- a/jjb/akraino-templates/akraino-ta-common-templates.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml
@@ -203,7 +203,6 @@
       - lf-infra-publish
 
 - job-template:
-    # TODO: This is untested draft to start testing ISO build from
     id: akraino-project-release-ta-build
     name: 'ta-ci-build'
     archive-artifacts: >
@@ -214,6 +213,11 @@
       work/**/*.log
       work/**/*.txt
       work/**/*.json
+      work/results/bin_checksum/**
+      work/results/repo/**
+      work/results/repo_files/**
+      work/results/rpmlists/**
+      work/results/src_repo/**
     build-days-to-keep: 30
     build-timeout: 60
     branch: master