From: Eric Ball <eball@linuxfoundation.org>
Date: Fri, 7 Jun 2019 14:16:59 +0000 (+0000)
Subject: Merge "Add new job for deploying libvirt"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=303d17b2f7ec8fb50dbc7b33840a89fb1f425d09;hp=-c

Merge "Add new job for deploying libvirt"
---

303d17b2f7ec8fb50dbc7b33840a89fb1f425d09
diff --combined jjb/akraino-templates/akraino-jjb-kni.yaml
index 8c28d8b,c5a62ca..ae16f98
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@@ -15,8 -15,8 +15,8 @@@
  # limitations under the License.
  #
  - job-template:
 -    id: kni-installer-build-installer
 -    name: '{project-name}-build-installer'
 +    id: kni-installer-verify-installer
 +    name: '{project-name}-verify-installer'
  
      ######################
      # Default parameters #
@@@ -50,6 -50,11 +50,6 @@@
            build-timeout: '{build-timeout}'
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
  
 -    gerrit_merge_triggers:
 -      - change-merged-event
 -      - comment-added-contains-event:
 -          comment-contains-value: remerge$
 -
      gerrit_trigger_file_paths:
        - compare-type: ANT
          pattern: '**'
@@@ -64,19 -69,10 +64,19 @@@
            submodule-timeout: '{submodule-timeout}'
            choosing-strategy: default
  
 +    gerrit_verify_triggers:
 +      - patchset-created-event:
 +          exclude-drafts: true
 +          exclude-trivial-rebase: false
 +          exclude-no-code-change: false
 +      - draft-published-event
 +      - comment-added-contains-event:
 +          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 +
      triggers:
        - gerrit:
            server-name: '{gerrit-server-name}'
 -          trigger-on: '{obj:gerrit_merge_triggers}'
 +          trigger-on: '{obj:gerrit_verify_triggers}'
            projects:
              - project-compare-type: ANT
                project-pattern: '{project}'
@@@ -96,8 -92,8 +96,8 @@@
        - lf-infra-publish
  
  - job-template:
 -    id: kni-installer-build-binary
 -    name: '{project-name}-build-binary'
 +    id: kni-installer-verify-binary
 +    name: '{project-name}-verify-binary'
  
      ######################
      # Default parameters #
@@@ -131,21 -127,17 +131,21 @@@
            build-timeout: '{build-timeout}'
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
  
 -    gerrit_merge_triggers:
 -      - change-merged-event
 -      - comment-added-contains-event:
 -          comment-contains-value: remerge$
 -
      gerrit_trigger_file_paths:
        - compare-type: REG_EXP
          pattern: 'Makefile'
        - compare-type: REG_EXP
          pattern: 'cmd/binary.go'
  
 +    gerrit_verify_triggers:
 +      - patchset-created-event:
 +          execlude-drafts: true
 +          exclude-trivial-rebase: false
 +          exclude-no-code-change: false
 +      - draft-published-event
 +      - comment-added-contains-event:
 +          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 +
      scm:
        - lf-infra-gerrit-scm:
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@@ -159,14 -151,16 +159,14 @@@
      triggers:
        - gerrit:
            server-name: '{gerrit-server-name}'
 -          trigger-on:
 -            - patchset-created-event:
 -                exclude-drafts: 'false'
 -                exclude-trivial-rebase: 'false'
 -                exclude-no-code-change: 'false'
 -            - change-merged-event
 -            - comment-added-contains-event:
 -                comment-contains-value: 'recheck'
 -            - comment-added-contains-event:
 -                comment-contains-value: 'reverify'
 +          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}'
  
      builders:
        - lf-infra-pre-build
@@@ -175,9 -169,6 +175,9 @@@
        - shell: !include-raw-escape:
            - ../shell/build_kni_binary.sh
  
 +    publishers:
 +      - lf-infra-publish
 +
  - job-template:
      id: kni-installer-merge-deploy-aws
      name: '{project-name}-merge-deploy-aws'
@@@ -275,6 -266,99 +275,99 @@@
      publishers:
        - lf-infra-publish
  
+ - job-template:
+     id: kni-installer-merge-deploy-libvirt
+     name: '{project-name}-merge-deploy-libvirt'
+ 
+     ######################
+     # Default parameters #
+     ######################
+ 
+     archive-artifacts: >
+       **/*.log
+     build-days-to-keep: 30
+     build-timeout: 60
+     build-node: kni-libvirt
+     submodule-recursive: true
+ 
+     #####################
+     # Job Configuration #
+     #####################
+ 
+     project-type: freestyle
+     node: '{build-node}'
+ 
+     properties:
+       - lf-infra-properties:
+           build-days-to-keep: '{build-days-to-keep}'
+ 
+     parameters:
+       - lf-infra-parameters:
+           project: '{project}'
+           branch: '{branch}'
+           stream: '{stream}'
+           lftools-version: '{lftools-version}'
+       - string:
+           name: ARCHIVE_ARTIFACTS
+           default: '{archive-artifacts}'
+           description: Artifacts to archive to the logs server.
+ 
+     wrappers:
+       - lf-infra-wrappers:
+           build-timeout: '{build-timeout}'
+           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+       - credentials-binding:
+           - ssh-user-private-key:
+               credential-id: kni-secrets
+               key-file-variable: KNI_KEY_PATH
+ 
+     gerrit_trigger_file_paths:
+       - compare-type: REG_EXP
+         pattern: '.*'
+ 
+     gerrit_merge_triggers:
+       - change-merged-event
+       - comment-added-contains-event:
+           comment-contains-value: remerge$
+ 
+     scm:
+       - lf-infra-gerrit-scm:
+           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+           git-url: '{git-url}/{project}.git'
+           refspec: '$GERRIT_REFSPEC'
+           branch: '$GERRIT_BRANCH'
+           submodule-recursive: '{submodule-recursive}'
+           submodule-timeout: '{submodule-timeout}'
+           choosing-strategy: default
+ 
+     triggers:
+       - gerrit:
+           server-name: '{gerrit-server-name}'
+           trigger-on: '{obj:gerrit_merge_triggers}'
+           projects:
+             - project-compare-type: ANT
+               project-pattern: '{project}'
+               branches:
+                 - branch-compare-type: ANT
+                   branch-pattern: '**/{branch}'
+               file-paths: '{obj:gerrit_trigger_file_paths}'
+ 
+     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: !include-raw-escape:
+           - ../shell/kni_deploy_libvirt.sh
+ 
+     publishers:
+       - lf-infra-publish
+ 
  - job-template:
      id: kni-templates-verify-deploy-aws
      name: '{project-name}-verify-deploy-aws'
@@@ -366,3 -450,98 +459,98 @@@
            - ../shell/install_go.sh
        - shell: !include-raw-escape:
            - ../shell/kni_deploy_aws.sh
+ 
+     publishers:
+       - lf-infra-publish
+ 
+ - job-template:
+     id: kni-templates-verify-deploy-libvirt
+     name: '{project-name}-verify-deploy-libvirt'
+ 
+     ######################
+     # Default parameters #
+     ######################
+ 
+     build-days-to-keep: 30
+     build-timeout: 60
+     build-node: kni-libvirt
+     submodule-recursive: true
+ 
+     #####################
+     # Job Configuration #
+     #####################
+ 
+     project-type: freestyle
+     node: '{build-node}'
+ 
+     properties:
+       - lf-infra-properties:
+           build-days-to-keep: '{build-days-to-keep}'
+ 
+     parameters:
+       - lf-infra-parameters:
+           project: '{project}'
+           branch: '{branch}'
+           stream: '{stream}'
+           lftools-version: '{lftools-version}'
+ 
+     wrappers:
+       - lf-infra-wrappers:
+           build-timeout: '{build-timeout}'
+           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+       - credentials-binding:
+           - ssh-user-private-key:
+               credential-id: kni-secrets
+               key-file-variable: KNI_KEY_PATH
+ 
+     gerrit_trigger_file_paths:
+       - compare-type: REG_EXP
+         pattern: 'aws/*'
+ 
+     scm:
+       - lf-infra-gerrit-scm:
+           jenkins-ssh-credential: '{jenkins-ssh-credential}'
+           git-url: '{git-url}/kni/installer.git'
+           refspec: '$GERRIT_REFSPEC'
+           branch: '$GERRIT_BRANCH'
+           submodule-recursive: '{submodule-recursive}'
+           submodule-timeout: '{submodule-timeout}'
+           choosing-strategy: default
+ 
+     gerrit_verify_triggers:
+       - patchset-created-event:
+           exclude-drafts: true
+           exclude-trivial-rebase: false
+           exclude-no-code-change: false
+       - draft-published-event
+       - comment-added-contains-event:
+           comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+ 
+     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}'
+ 
+     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: !include-raw-escape:
+           - ../shell/kni_deploy_libvirt.sh
+ 
+     publishers:
+       - lf-infra-publish
+ 
diff --combined jjb/kni/kni_installer.yaml
index 8a0e7ba,861cbe3..ac0e58f
--- a/jjb/kni/kni_installer.yaml
+++ b/jjb/kni/kni_installer.yaml
@@@ -6,9 -6,10 +6,10 @@@
      stream: master
      branch: master
      jobs:
 -      - kni-installer-build-installer
 -      - kni-installer-build-binary
 +      - kni-installer-verify-installer
 +      - kni-installer-verify-binary
        - kni-installer-merge-deploy-aws
+       - kni-installer-merge-deploy-libvirt
  - project:
      name: kni-templates
      project: 'kni/templates'
@@@ -17,3 -18,4 +18,4 @@@
      branch: master
      jobs:
        - kni-templates-verify-deploy-aws
+       - kni-templates-verify-deploy-libvirt