X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-jjb-kni.yaml;h=7edb45c6003b2955fe500d0bd0971acd5514581a;hb=a58c16da4c26e8832bcd76d535f5c1f7e1914fc7;hp=1f64bcc872001c591603292cbc8b0c6efe4fb240;hpb=cbe0c7f9bbfdcc4171a9a69a0390cd720e3d2a2b;p=ci-management.git diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index 1f64bcc..7edb45c 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -14,6 +14,28 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +# A builder to ship logs from a bare metal Akraino deploy test node. +# Similar to lf-infra-ship-logs without python-tools-install.sh and +# job-cost.sh. +- builder: + name: kni-deploy-ship-logs + builders: + # Ensure no pre-existing .netrc files are overriding logs config + - lf-provide-maven-settings-cleanup + - config-file-provider: + files: + - file-id: "jenkins-log-archives-settings" + variable: "SETTINGS_FILE" + - lf-infra-create-netrc: + server-id: logs + - shell: !include-raw: + - ../../global-jjb/shell/logs-deploy.sh + - shell: !include-raw: + - ../../global-jjb/shell/logs-clear-credentials.sh + - description-setter: + regexp: "(^(Nexus|S3) build logs: .*)" + - kni_common: &kni_common name: kni-common @@ -58,7 +80,7 @@ submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' submodule-disable: false - choosing-strategy: default + choosing-strategy: gerrit gerrit_verify_triggers: - patchset-created-event: @@ -117,7 +139,7 @@ submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' submodule-disable: false - choosing-strategy: default + choosing-strategy: gerrit basedir: '{project-name}' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -130,6 +152,26 @@ choosing-strategy: default basedir: 'installer' + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - kni-deploy-ship-logs + mark-unstable-if-failed: true + - workspace-cleanup: + exclude: + # Do not clean up *.jenkins-trigger files for jobs that use a + # properties file as input for triggering another build. + - "**/*.jenkins-trigger" + fail-build: false + - job-template: id: kni-installer-verify-installer name: '{project-name}-verify-installer' @@ -147,64 +189,66 @@ - ../shell/build_kni_installer.sh - job-template: - id: kni-installer-verify-binary - name: '{project-name}-verify-binary' - <<: *kni_common - build-node: centos7-builder-8c-8g + id: kni-verify-deploy-aws + name: 'kni-{project-name}-verify-deploy-aws' + build-node: kni-cloud + <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'Makefile' + pattern: 'profiles/production.aws/**' - compare-type: ANT - pattern: 'cmd/binary.go' - - triggers: - - gerrit: - server-name: '{gerrit-server-name}' - trigger-on: '{obj:gerrit_verify_triggers}' - projects: - - project-compare-type: ANT - project-pattern: '{project}' - branches: - - branch-compare-type: ANT - branch-pattern: '**/{branch}' - file-paths: '{obj:gerrit_trigger_file_paths}' + pattern: 'sites/testing.aws.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 - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/build_kni_binary.sh + - shell: ./installer/ci/kni_deploy_aws.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 + id: kni-verify-deploy-gcp + name: 'kni-{project-name}-verify-deploy-gcp' + site: edge-sites-testing.gcp.devcluster.openshift.com + build-node: kni-cloud + <<: *kni_common_deploy + + gerrit_trigger_file_paths: + - compare-type: ANT + pattern: 'profiles/production.gcp/**' + - compare-type: ANT + pattern: 'sites/edge-sites-testing.gcp.devcluster.openshift.com/**' + - compare-type: ANT + pattern: 'base/**' - gerrit_trigger_file_paths: [] - gerrit_build_triggers: - - comment-added-contains-event: - comment-contains-value: '^build-binary' builders: - lf-infra-pre-build + - config-file-provider: + files: + - file-id: kni-coreos-pull-secret + target: akraino-secrets/coreos-pull-secret - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/build_openshift_install_libvirt_binary.sh + - shell: ./installer/ci/kni_deploy_gcp.sh {site} - job-template: - id: kni-verify-deploy-aws - name: 'kni-{project-name}-verify-deploy-aws' - build-node: kni-libvirt + id: kni-verify-deploy-gcp-hub + name: 'kni-{project-name}-verify-deploy-gcp' + site: kni-mgmt-hub.gcp.devcluster.openshift.com + build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/production.aws/**' + pattern: 'profiles/production.gcp/**' - compare-type: ANT - pattern: 'sites/testing.aws.edge-sites.net/**' + pattern: 'sites/kni-mgmt-hub.gcp.devcluster.openshift.com/**' - compare-type: ANT pattern: 'base/**' @@ -216,19 +260,20 @@ target: akraino-secrets/coreos-pull-secret - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: ./installer/ci/kni_deploy_aws.sh + - shell: ./installer/ci/kni_deploy_gcp.sh {site} - job-template: - id: kni-verify-deploy-libvirt - name: 'kni-{project-name}-verify-deploy-libvirt' - build-node: kni-libvirt + id: kni-verify-deploy-gcp-ie + name: 'kni-{project-name}-verify-deploy-gcp' + site: kni-ie.gcp.devcluster.openshift.com + build-node: kni-cloud <<: *kni_common_deploy gerrit_trigger_file_paths: - compare-type: ANT - pattern: 'profiles/testing.libvirt/**' + pattern: 'profiles/production.gcp/**' - compare-type: ANT - pattern: 'sites/testing.virt.edge-sites.net/**' + pattern: 'sites/kni-ie.gcp.devcluster.openshift.com/**' - compare-type: ANT pattern: 'base/**' @@ -238,11 +283,9 @@ 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 + - shell: ./installer/ci/kni_deploy_gcp.sh {site} - job-template: id: kni-verify-deploy-baremetal @@ -262,14 +305,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' + choosing-strategy: gerrit + basedir: 'kni-blueprint-pae' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/kni/installer.git'