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=feb1bc2df0680f9c75ec4a03ea10badb79f70b13;hp=1f6bcb30d0e6a0583c4bd2f5344478c331a7b2eb;hb=0904fdd5e0e3b113ee90e77c646a7f156d878762;hpb=22890f1c543c312ca2b336372746be29ad498f53 diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index 1f6bcb3..feb1bc2 100644 --- 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,8 @@ # 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: @@ -215,12 +227,24 @@ 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: @@ -290,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