diff options
Diffstat (limited to 'jjb/joid')
| -rw-r--r-- | jjb/joid/joid-daily-jobs.yml | 131 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 97 | ||||
| -rw-r--r-- | jjb/joid/joid-verify-jobs.yml | 32 |
3 files changed, 157 insertions, 103 deletions
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 6d0370983..b28dd6025 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -17,10 +17,10 @@ branch: '{stream}' disabled: false gs-pathname: '' - colorado: &colorado - stream: colorado + danube: &danube + stream: danube branch: 'stable/{stream}' - disabled: false + disabled: true gs-pathname: '/{stream}' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING @@ -36,10 +36,10 @@ <<: *master - baremetal: slave-label: joid-baremetal - <<: *colorado + <<: *danube - virtual: slave-label: joid-virtual - <<: *colorado + <<: *danube #-------------------------------- # None-CI PODs #-------------------------------- @@ -72,6 +72,10 @@ auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' + - 'k8-nosdn-nofeature-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'k8-nosdn-lb-noha': + auto-trigger-name: 'daily-trigger-disabled' jobs: - 'joid-{scenario}-{pod}-daily-{stream}' @@ -88,6 +92,7 @@ concurrent: false properties: + - logrotate-default - throttle: enabled: true max-total: 4 @@ -109,6 +114,7 @@ parameters: - project-parameter: project: '{project}' + branch: '{branch}' - '{installer}-defaults' - '{slave-label}-defaults': installer: '{installer}' @@ -157,6 +163,7 @@ concurrent: true properties: + - logrotate-default - throttle: enabled: true max-total: 4 @@ -178,6 +185,7 @@ parameters: - project-parameter: project: '{project}' + branch: '{branch}' - '{installer}-defaults' - '{slave-label}-defaults': installer: '{installer}' @@ -186,10 +194,7 @@ default: 'os-odl_l2-nofeature-ha' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm builders: - description-setter: @@ -227,17 +232,17 @@ name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger' triggers: - timed: '' -# os-nosdn-nofeature-ha trigger - branch: colorado +# os-nosdn-nofeature-ha trigger - branch: danube - trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-colorado-trigger' + name: 'joid-os-nosdn-nofeature-ha-baremetal-danube-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'joid-os-nosdn-nofeature-ha-virtual-colorado-trigger' + name: 'joid-os-nosdn-nofeature-ha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-nofeature-ha-orange-pod1-colorado-trigger' + name: 'joid-os-nosdn-nofeature-ha-orange-pod1-danube-trigger' triggers: - timed: '' # os-odl_l2-nofeature-ha trigger - branch: master @@ -253,17 +258,17 @@ name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger' triggers: - timed: '' -# os-odl_l2-nofeature-ha trigger - branch: colorado +# os-odl_l2-nofeature-ha trigger - branch: danube - trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-danube-trigger' triggers: - timed: '0 7 * * *' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-virtual-colorado-trigger' + name: 'joid-os-odl_l2-nofeature-ha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-colorado-trigger' + name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-danube-trigger' triggers: - timed: '' # os-onos-nofeature-ha trigger - branch: master @@ -279,17 +284,17 @@ name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger' triggers: - timed: '' -# os-onos-nofeature-ha trigger - branch: colorado +# os-onos-nofeature-ha trigger - branch: danube - trigger: - name: 'joid-os-onos-nofeature-ha-baremetal-colorado-trigger' + name: 'joid-os-onos-nofeature-ha-baremetal-danube-trigger' triggers: - timed: '0 12 * * *' - trigger: - name: 'joid-os-onos-nofeature-ha-virtual-colorado-trigger' + name: 'joid-os-onos-nofeature-ha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-orange-pod1-colorado-trigger' + name: 'joid-os-onos-nofeature-ha-orange-pod1-danube-trigger' triggers: - timed: '' # os-onos-sfc-ha trigger - branch: master @@ -305,17 +310,17 @@ name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger' triggers: - timed: '' -# os-onos-sfc-ha trigger - branch: colorado +# os-onos-sfc-ha trigger - branch: danube - trigger: - name: 'joid-os-onos-sfc-ha-baremetal-colorado-trigger' + name: 'joid-os-onos-sfc-ha-baremetal-danube-trigger' triggers: - timed: '0 17 * * *' - trigger: - name: 'joid-os-onos-sfc-ha-virtual-colorado-trigger' + name: 'joid-os-onos-sfc-ha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-sfc-ha-orange-pod1-colorado-trigger' + name: 'joid-os-onos-sfc-ha-orange-pod1-danube-trigger' triggers: - timed: '' # os-nosdn-lxd-noha trigger - branch: master @@ -331,17 +336,17 @@ name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger' triggers: - timed: '' -# os-nosdn-lxd-noha trigger - branch: colorado +# os-nosdn-lxd-noha trigger - branch: danube - trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-colorado-trigger' + name: 'joid-os-nosdn-lxd-noha-baremetal-danube-trigger' triggers: - timed: '0 22 * * *' - trigger: - name: 'joid-os-nosdn-lxd-noha-virtual-colorado-trigger' + name: 'joid-os-nosdn-lxd-noha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-lxd-noha-orange-pod1-colorado-trigger' + name: 'joid-os-nosdn-lxd-noha-orange-pod1-danube-trigger' triggers: - timed: '' # os-nosdn-lxd-ha trigger - branch: master @@ -357,17 +362,17 @@ name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger' triggers: - timed: '' -# os-nosdn-lxd-ha trigger - branch: colorado +# os-nosdn-lxd-ha trigger - branch: danube - trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-colorado-trigger' + name: 'joid-os-nosdn-lxd-ha-baremetal-danube-trigger' triggers: - timed: '0 10 * * *' - trigger: - name: 'joid-os-nosdn-lxd-ha-virtual-colorado-trigger' + name: 'joid-os-nosdn-lxd-ha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-lxd-ha-orange-pod1-colorado-trigger' + name: 'joid-os-nosdn-lxd-ha-orange-pod1-danube-trigger' triggers: - timed: '' # os-nosdn-nofeature-noha trigger - branch: master @@ -383,16 +388,68 @@ name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger' triggers: - timed: '' -# os-nosdn-nofeature-noha trigger - branch: colorado +# os-nosdn-nofeature-noha trigger - branch: danube - trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-colorado-trigger' + name: 'joid-os-nosdn-nofeature-noha-baremetal-danube-trigger' triggers: - timed: '0 4 * * *' - trigger: - name: 'joid-os-nosdn-nofeature-noha-virtual-colorado-trigger' + name: 'joid-os-nosdn-nofeature-noha-virtual-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-nofeature-noha-orange-pod1-danube-trigger' + triggers: + - timed: '' +# k8-nosdn-nofeature-noha trigger - branch: master +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' + triggers: + - timed: '5 15 * * *' +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-master-trigger' + triggers: + - timed: '' +# k8-nosdn-nofeature-noha trigger - branch: danube +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-baremetal-danube-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-virtual-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-danube-trigger' + triggers: + - timed: '' +# k8-nosdn-lb-noha trigger - branch: master +- trigger: + name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' + triggers: + - timed: '5 20 * * *' +- trigger: + name: 'joid-k8-nosdn-lb-noha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-k8-nosdn-lb-noha-orange-pod1-master-trigger' + triggers: + - timed: '' +# k8-nosdn-lb-noha trigger - branch: danube +- trigger: + name: 'joid-k8-nosdn-lb-noha-baremetal-danube-trigger' + triggers: + - timed: '0 20 * * *' +- trigger: + name: 'joid-k8-nosdn-lb-noha-virtual-danube-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-nofeature-noha-orange-pod1-colorado-trigger' + name: 'joid-k8-nosdn-lb-noha-orange-pod1-danube-trigger' triggers: - timed: '' diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 05c2de1fc..e197dbd8c 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -45,17 +45,24 @@ export POD_NAME=${POD/-} ## cd $WORKSPACE/ci -if [ -e "$LAB_CONFIG/environments.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then + +if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then echo "------ Recover Juju environment to use MAAS ------" - cp $LAB_CONFIG/environments.yaml . - cp $LAB_CONFIG/deployment.yaml . - if [ -e $LAB_CONFIG/deployconfig.yaml ]; then + if [ ! -e deployconfig.yaml ]; then cp $LAB_CONFIG/deployconfig.yaml . + cp $LAB_CONFIG/deployment.yaml . + cp $LAB_CONFIG/labconfig.yaml . fi else - echo "------ Redeploy MAAS ------" - ./00-maasdeploy.sh $POD_NAME - exit_on_error $? "MAAS Deploy FAILED" + if ["$NODE_NAME" == "default" ]; then + echo "------ Redeploy MAAS ------" + ./03-maasdeploy.sh default + exit_on_error $? "MAAS Deploy FAILED" + else + echo "------ Redeploy MAAS ------" + ./03-maasdeploy.sh custom $LAB_CONFIG/labconfig.yaml + exit_on_error $? "MAAS Deploy FAILED" + fi fi ## @@ -64,8 +71,9 @@ fi # Based on scenario naming we can get joid options # naming convention: -# os-<controller>-<nfvfeature>-<mode>[-<extrastuff>] +# <model>-<controller>-<nfvfeature>-<mode>[-<extrastuff>] # With parameters: +# model=(os|k8) # controller=(nosdn|odl_l3|odl_l2|onos|ocl) # No odl_l3 today # nfvfeature=(kvm|ovs|dpdk|nofeature) @@ -77,6 +85,7 @@ fi IFS='-' read -r -a DEPLOY_OPTIONS <<< "${DEPLOY_SCENARIO}--" #last -- need to avoid nounset error +JOID_MODEL=${DEPLOY_OPTIONS[0]} SDN_CONTROLLER=${DEPLOY_OPTIONS[1]} NFV_FEATURES=${DEPLOY_OPTIONS[2]} HA_MODE=${DEPLOY_OPTIONS[3]} @@ -103,49 +112,47 @@ fi ## Configure Joid deployment ## -echo "------ Deploy with juju ------" -echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES" +if [ "$JOID_MODEL" == 'k8' ]; then + echo "------ Deploy with juju ------" + echo "Execute: ./deploy.sh -m $JOID_MODEL -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 -f $NFV_FEATURES -exit_on_error $? "Main deploy FAILED" + ./deploy.sh -m kubernetes -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES + exit_on_error $? "Main deploy FAILED" +fi ## ## Set Admin RC ## -JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc -echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------" - -# get controller IP -case "$SDN_CONTROLLER" in - "odl") - SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //') - ;; - "onos") - SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //') - ;; - *) - SDN_CONTROLLER_IP='none' - ;; -esac -SDN_PASSWORD='admin' - -# export the openrc file by getting the one generated by joid and add SDN -# controller for Functest -cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC -cat << EOF >> $JOID_ADMIN_OPENRC -export SDN_CONTROLLER=$SDN_CONTROLLER_IP -export SDN_PASSWORD=$SDN_PASSWORD -EOF - -## -## Backup local juju env -## +if [ "$JOID_MODEL" == 'os' ]; then + echo "------ Deploy with juju ------" + echo "Execute: ./deploy.sh -m $JOID_MODEL -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES" + + ./deploy.sh -m openstack -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES + exit_on_error $? "Main deploy FAILED" + + JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc + echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------" + + # get controller IP + case "$SDN_CONTROLLER" in + "odl") + SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //') + ;; + "onos") + SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //') + ;; + *) + SDN_CONTROLLER_IP='none' + ;; + esac + SDN_PASSWORD='admin' + + # export the openrc file by getting the one generated by joid and add SDN + # controller for Functest + # cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC + echo export SDN_CONTROLLER=$SDN_CONTROLLER_IP >> $JOID_ADMIN_OPENRC + echo export SDN_PASSWORD=$SDN_PASSWORD >> $JOID_ADMIN_OPENRC -echo "------ Backup Juju environment ------" -cp environments.yaml $LAB_CONFIG/ -cp deployment.yaml $LAB_CONFIG/ -if [ -e deployconfig.yaml ]; then - cp deployconfig.yaml $LAB_CONFIG fi ## diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml index 649c31bea..7b8ce7701 100644 --- a/jjb/joid/joid-verify-jobs.yml +++ b/jjb/joid/joid-verify-jobs.yml @@ -12,7 +12,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - colorado: + - danube: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -45,6 +45,7 @@ concurrent: true properties: + - logrotate-default - throttle: enabled: true max-total: 4 @@ -54,19 +55,14 @@ use-build-blocker: true blocking-jobs: - 'joid-verify-master' - - 'joid-verify-colorado' + - 'joid-verify-danube' block-level: 'NODE' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - ssh-agent-wrapper - timeout: timeout: 360 fail: true @@ -98,7 +94,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - 'joid-virtual-defaults' @@ -112,7 +107,7 @@ - name: 'joid-verify-basic-{stream}' current-parameters: false predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH + BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE @@ -125,7 +120,7 @@ - name: 'joid-verify-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH + BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE @@ -139,7 +134,7 @@ - name: 'joid-verify-smoke-test-{stream}' current-parameters: false predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH + BRANCH=$BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE @@ -155,6 +150,7 @@ concurrent: true properties: + - logrotate-default - throttle: enabled: true max-total: 4 @@ -168,15 +164,10 @@ block-level: 'NODE' scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - git-scm-gerrit wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - ssh-agent-wrapper - timeout: timeout: 360 fail: true @@ -184,7 +175,6 @@ parameters: - project-parameter: project: '{project}' - - gerrit-parameter: branch: '{branch}' - '{installer}-defaults' - '{slave-label}-defaults' |