Revert "Add signing to Akraino deploy templates"

[ci-management.git] / jjb / akraino-templates / akraino-ta-common-macros.yaml

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index d208aea..a0d578c 100644 (file)
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -112,11 +112,12 @@
 - builder:
     name: ta-builder-tox
     builders:
-        - lf-pip-install:
-            pip-packages: tox
         - shell: |2-
             #!/bin/bash -ex
-            source /tmp/v/tox/bin/activate
+            source ~/lf-env.sh
+
+            lf-activate-venv tox
+            tox --version
             for f in $(find $GERRIT_PROJECT -name tox.ini); do
                 pushd $(dirname $f)
                 tox
@@ -200,6 +201,7 @@
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
           - ../../global-jjb/shell/python-tools-install.sh
+      - shell: !include-raw:
           - ../shell/ta-rpm-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
@@ -219,6 +221,7 @@
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
           - ../../global-jjb/shell/python-tools-install.sh
+      - shell: !include-raw:
           - ../shell/ta-iso-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
@@ -287,9 +290,10 @@
       - shell: |2-
           #!/bin/bash -ex
           if apt --version 2>1 >/dev/null; then
+              sudo chmod +r /boot/vmlinuz*
               if ! docker --version 2>1 >/dev/null; then
                   sudo apt update
-                  sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+                  sudo apt install -y apt-transport-https ca-certificates curl software-properties-common rename
                   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
                   sudo add-apt-repository -y "deb http://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
                   sudo apt update
@@ -385,8 +389,19 @@
 - publisher:
     name: ta-publisher-job-merge
     publishers:
-      - lf-infra-publish
+      - ta-publisher-ci-build:
+          arch: '{arch}'
       - trigger-parameterized-builds:
           - project: 'ta-ci-build-{arch}'
             condition: UNSTABLE_OR_BETTER
             trigger-with-no-params: true
+
+- publisher:
+    name: ta-publisher-ci-build
+    publishers:
+      - lf-infra-publish
+      - email:
+          recipients: !j2: |
+            {%- if 'arm64' in arch -%}
+            armband@enea.com
+            {%- endif -%}