diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 76 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 4 |
2 files changed, 78 insertions, 2 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index b13b51fec..f6f12298a 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -57,6 +57,10 @@ auto-trigger-name: 'daily-trigger-disabled' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-lxd-ha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-nosdn-lxd-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': @@ -308,3 +312,75 @@ name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' + +# os-nosdn-lxd-noha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger' + triggers: + - timed: '' + +# os-nosdn-lxd-noha trigger - branch: stable/brahmaputra +- trigger: + name: 'joid-os-nosdn-lxd-noha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-noha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' + +# os-nosdn-lxd-ha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger' + triggers: + - timed: '' + +# os-nosdn-lxd-ha trigger - branch: stable/brahmaputra +- trigger: + name: 'joid-os-nosdn-lxd-ha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index bd2597320..37b0c0dc3 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -140,9 +140,9 @@ sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE ## echo "------ Deploy with juju ------" -echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO" +echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES" -./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO +./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES exit_on_error $? "Main deploy FAILED" ## |