X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;fp=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=f0313010660431dfef4f8f33135a53c80057e7d7;hp=16f0db5d15edff0a1f52c381bf961ef048c2df21;hb=696cc7df40341399f545521afa9957469341d5f7;hpb=efa0120dc6b80d5e144c40531323098e7d6acbfd diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index 16f0db5..f031301 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -245,7 +245,7 @@ comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' scm: - - lf-infra-gerrit-scm: + - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/{project}.git' refspec: '$GERRIT_REFSPEC' @@ -254,7 +254,17 @@ submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - + basedir: 'blueprint-pae' + - akraino-lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}/kni/installer.git' + refspec: 'refs/heads/master' + branch: 'master' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: false + choosing-strategy: default + basedir: 'installer' triggers: - gerrit: server-name: '{gerrit-server-name}' @@ -275,8 +285,7 @@ target: akraino-secrets/coreos-pull-secret - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/kni_deploy_aws.sh + - shell: ./installer/ci/kni_deploy_aws.sh publishers: - lf-infra-publish @@ -358,7 +367,7 @@ file-paths: '{obj:gerrit_trigger_file_paths}' scm: - - lf-infra-gerrit-scm: + - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/{project}.git' refspec: '$GERRIT_REFSPEC' @@ -367,7 +376,17 @@ submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - + basedir: 'blueprint-pae' + - akraino-lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}/kni/installer.git' + refspec: 'refs/heads/master' + branch: 'master' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: false + choosing-strategy: default + basedir: 'installer' builders: - lf-infra-pre-build - config-file-provider: @@ -378,8 +397,7 @@ target: akraino-secrets/ssh-pub-key - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/kni_deploy_libvirt.sh + - shell: ./installer/ci/kni_deploy_libvirt.sh publishers: - lf-infra-publish