X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=6d380c23b93b63ae997f5689e3f861828539848d;hp=dbe69aa75623f0d3d5c719b5a795efafd6c7dac3;hb=40b2bbbd936f43e49575f127cad9db64d34ac330;hpb=94fade00a59bad93684e419cb5fd12261d0fbd2f diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index dbe69aa..6d380c2 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -177,23 +177,6 @@ - shell: !include-raw-escape: - ../shell/build_kni_binary.sh -- job-template: - id: kni-installer-publish-openshift-install-libvirt-binary - name: '{project-name}-publish-openshift-install-libvirt-binary' - <<: *kni_common - build-node: centos7-builder-8c-8g - - gerrit_trigger_file_paths: [] - gerrit_build_triggers: - - comment-added-contains-event: - comment-contains-value: '^build-binary' - builders: - - lf-infra-pre-build - - shell: !include-raw-escape: - - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/build_openshift_install_libvirt_binary.sh - - job-template: id: kni-verify-deploy-aws name: 'kni-{project-name}-verify-deploy-aws' @@ -242,39 +225,12 @@ - ../shell/install_go.sh - shell: ./installer/ci/kni_deploy_gcp.sh -- job-template: - id: kni-verify-deploy-libvirt - name: 'kni-{project-name}-verify-deploy-libvirt' - build-node: kni-libvirt - build-timeout: 120 - <<: *kni_common_deploy - - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'profiles/testing.libvirt/**' - - compare-type: ANT - pattern: 'sites/testing.virt.edge-sites.net/**' - - compare-type: ANT - pattern: 'base/**' - - builders: - - lf-infra-pre-build - - config-file-provider: - files: - - file-id: kni-coreos-pull-secret - target: akraino-secrets/coreos-pull-secret - - file-id: kni-ssh-pub-key - target: akraino-secrets/ssh-pub-key - - shell: !include-raw-escape: - - ../shell/install_go.sh - - shell: ./installer/ci/kni_deploy_libvirt.sh - - job-template: id: kni-verify-deploy-baremetal name: 'kni-{project-name}-verify-deploy-baremetal' <<: *kni_common_deploy build-timeout: 120 - build-node: kni-baremetal + build-node: kni-libvirt gerrit_trigger_file_paths: - compare-type: ANT @@ -287,14 +243,14 @@ scm: - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: 'https://github.com/yrobla/testing.baremetal.edge-sites.net' + git-url: 'https://gerrit.akraino.org/r/kni/blueprint-pae' refspec: '$GERRIT_REFSPEC' branch: '$GERRIT_BRANCH' submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - basedir: 'testing.baremetal.edge-sites.net' + basedir: 'kni-blueprint-pae' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/kni/installer.git'