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 782e6b8..feb1bc2 100644 (file)
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -189,6 +189,16 @@
           files:
             - file-id: 'ta-settings'
               variable: 'SETTINGS_FILE'
+            - file-id: lftoolsini
+              target: "$HOME/.config/lftools/lftools.ini"
+            - file-id: sigul-config
+              variable: SIGUL_CONFIG
+            - file-id: sigul-password
+              variable: SIGUL_PASSWORD
+            - file-id: sigul-pki
+              variable: SIGUL_PKI
+            - file-id: signing-pubkey
+              variable: SIGNING_PUBKEY
       - inject:
           properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org'
       - lf-infra-create-netrc:
@@ -201,6 +211,9 @@
           # 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: ../global-jjb/shell/sigul-configuration.sh
+      - shell: !include-raw: ../global-jjb/shell/sigul-install.sh
+      - shell: !include-raw:
           - ../shell/ta-rpm-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
@@ -214,12 +227,25 @@
           files:
             - file-id: 'ta-settings'
               variable: 'SETTINGS_FILE'
+            - file-id: lftoolsini
+              target: "$HOME/.config/lftools/lftools.ini"
+            - file-id: sigul-config
+              variable: SIGUL_CONFIG
+            - file-id: sigul-password
+              variable: SIGUL_PASSWORD
+            - file-id: sigul-pki
+              variable: SIGUL_PKI
+            - file-id: signing-pubkey
+              variable: SIGNING_PUBKEY
       - lf-infra-create-netrc:
           server-id: images-snapshots
       - shell: !include-raw:
           # 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: ../global-jjb/shell/sigul-configuration.sh
+      - shell: !include-raw: ../global-jjb/shell/sigul-install.sh
+      - shell: !include-raw:
           - ../shell/ta-iso-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
@@ -288,9 +314,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