X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-ta-common-macros.yaml;h=24436b9e81297f8eb6c40f16f88ab4c9a164c271;hp=7cfbfe1434c1d460890ab2cb874e1bdf37e877e2;hb=6c898f65071bde2dfa43c052a92f1b96a2b16aa5;hpb=c73b99dd7b376740125636ae07cf2c81985ef214

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index 7cfbfe1..24436b9 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -219,11 +219,21 @@
       - shell: |2-
           sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
           sudo yum -y install docker-ce docker-ce-cli containerd.io
+          sudo mkdir -p /etc/docker/
+          echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
           sudo systemctl start docker
           # Ugly hack to make docker usable for non-root
           # (adding to the group would require re-login)
           sudo chmod 777 /var/run/docker.sock
 
+- builder:
+    name: ta-builder-install-build-tools
+    builders:
+      - shell: |2-
+          sudo yum -y install createrepo libguestfs-tools-c jq
+          sudo systemctl start libvirtd
+          systemctl status libvirtd
+
 ###########
 # TRIGGER #
 ###########
@@ -260,6 +270,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}'
@@ -275,9 +287,13 @@
 - publisher:
     name: ta-publisher-job-verify
     publishers:
-        - lf-infra-publish
+      - lf-infra-publish
 
 - publisher:
     name: ta-publisher-job-merge
     publishers:
-        - lf-infra-publish
+      - lf-infra-publish
+      - trigger-parameterized-builds:
+          - project: 'ta-ci-build'
+            condition: UNSTABLE_OR_BETTER
+            trigger-with-no-params: true