diff options
| -rwxr-xr-x | jjb/3rd_party_ci/create-apex-vms.sh | 8 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/install-netvirt.sh | 8 | ||||
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 59 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 18 |
4 files changed, 67 insertions, 26 deletions
diff --git a/jjb/3rd_party_ci/create-apex-vms.sh b/jjb/3rd_party_ci/create-apex-vms.sh new file mode 100755 index 000000000..cb742712b --- /dev/null +++ b/jjb/3rd_party_ci/create-apex-vms.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# clone opnfv sdnvpn repo +git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git +cd sdnvpn +ls -al + +# here is where the script(s) to bring up apex vms should be executed diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index c24e89036..041d8517e 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -1,4 +1,8 @@ #!/bin/bash -echo "Using the downloaded artifact to install netvirt" -ls -al $NETVIRT_ARTIFACT +# clone opnfv sdnvpn repo +git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git +cd sdnvpn +ls -al + +# here is where the script(s) to install netvirt should be executed diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index d44fc36f4..54d1e4353 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -16,9 +16,14 @@ # patch verification phases ##################################### phase: - - 'install' - - 'functest' - - 'postprocess' + - 'create-apex-vms': + slave-label: 'ericsson-virtual5' + - 'install-netvirt': + slave-label: 'ericsson-virtual6' + - 'functest': + slave-label: 'ericsson-virtual6' + - 'postprocess': + slave-label: 'ericsson-virtual6' ##################################### # jobs ##################################### @@ -52,18 +57,9 @@ - string: name: NETVIRT_ARTIFACT default: $WORKSPACE/distribution-karaf.tar.gz" - - 'odl-netvirt-virtual-defaults' + - 'ericsson-virtual6-defaults' scm: - #- git: - # url: 'https://git.opendaylight.org/gerrit/p/$PROJECT.git' - # refspec: '$GERRIT_REFSPEC' - # branches: - # - 'origin/$GERRIT_BRANCH' - # skip-tag: true - # choosing-strategy: 'gerrit' - # timeout: 10 - # wipe-workspace: true - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' refspec: '$GERRIT_REFSPEC' @@ -77,6 +73,8 @@ comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : SUCCESS' - comment-added-contains-event: comment-contains-value: 'https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-carbon/.*?/ : UNSTABLE' + - comment-added-contains-event: + comment-contains-value: 'opnfv-test' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -88,14 +86,28 @@ builders: - description-setter: description: "Built on $NODE_NAME" - - shell: | - #!/bin/bash - ls -al $WORKSPACE - multijob: - name: install + name: create-apex-vms + condition: SUCCESSFUL + projects: + - name: 'odl-netvirt-verify-virtual-create-apex-vms-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID + GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER + GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION + NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT + node-parameters: false + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: install-netvirt condition: SUCCESSFUL projects: - - name: 'odl-netvirt-verify-virtual-install-{stream}' + - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}' current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH @@ -183,7 +195,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'odl-netvirt-virtual-defaults' + - '{slave-label}-defaults' - '{installer}-defaults' builders: @@ -194,19 +206,22 @@ # builder macros ##################################### - builder: - name: 'netvirt-verify-install-builder' + name: 'netvirt-verify-create-apex-vms-builder' + builders: + - shell: + !include-raw: ./create-apex-vms.sh +- builder: + name: 'netvirt-verify-install-netvirt-builder' builders: - shell: !include-raw: ./download-netvirt-artifact.sh - shell: !include-raw: ./install-netvirt.sh - - builder: name: 'netvirt-verify-functest-builder' builders: - shell: !include-raw: ./functest-netvirt.sh - - builder: name: 'netvirt-verify-postprocess-builder' builders: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index d1b4b8f5f..96ad75c69 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -671,15 +671,29 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'odl-netvirt-virtual-defaults' + name: 'ericsson-virtual5-defaults' parameters: - label: name: SLAVE_LABEL - default: 'odl-netvirt-virtual' + default: 'ericsson-virtual5' - string: name: GIT_BASE default: https://git.opendaylight.org/gerrit/p/$PROJECT.git description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'ericsson-virtual6-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'ericsson-virtual6' + - string: + name: GIT_BASE + default: https://git.opendaylight.org/gerrit/p/$PROJECT.git + description: 'Git URL to use on this Jenkins Slave' + - string: + name: APEX_ENV_NUMBER + default: 0 + description: 'The number of the Apex environment on the machine' ##################################################### # These slaves are just dummy slaves for sandbox jobs ##################################################### |