diff options
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 2 | ||||
| -rw-r--r-- | jjb/multisite/multisite-daily-jobs.yml | 247 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 10 | ||||
| -rw-r--r-- | jjb/qtip/qtip-project-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 2 |
5 files changed, 265 insertions, 3 deletions
diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index 1f4aa8f85..2a0f09a3f 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -11,7 +11,7 @@ set -o errexit set -o pipefail # use proxy url to replace the nomral URL, for googleusercontent.com will be blocked randomly -[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=$GS_BASE_PROXY +[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=${GS_BASE_PROXY%%/*}/$GS_URL if [[ "$JOB_NAME" =~ "merge" ]]; then echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties" diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml new file mode 100644 index 000000000..cfb40a1fa --- /dev/null +++ b/jjb/multisite/multisite-daily-jobs.yml @@ -0,0 +1,247 @@ +- project: + name: kingbird + + project: 'multisite' + + jobs: + - 'multisite-kingbird-virtual-daily-{stream}' + - 'multisite-{phase}-{stream}' + + phase: + - 'fuel-deploy-regionone-virtual' + - 'fuel-deploy-regiontwo-virtual' + - 'register-endpoints' + - 'update-auth' + - 'kingbird-deploy-virtual' + - 'kingbird-functest' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + timed: '#@midnight' + +- job-template: + name: 'multisite-kingbird-virtual-daily-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + concurrent: false + + parameters: + - project-parameter: + project: '{project}' + - string: + name: KINGBIRD_LOG_FILE + default: $WORKSPACE/kingbird.log + - 'multisite-virtual-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-multisite-noha' + + triggers: + - timed: '{timed}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: fuel-deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'multisite-fuel-deploy-regionone-virtual-{stream}' + current-parameters: false + predefined-parameters: | + FUEL_VERSION=latest + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + OS_REGION=RegionOne + REGIONONE_IP=10.2.117.79 + REGIONTWO_IP=10.2.117.181 + node-parameters: false + node-label-name: SLAVE_LABEL + node-label: intel-virtual2 + kill-phase-on: FAILURE + abort-all-job: true + - name: 'multisite-fuel-deploy-regiontwo-virtual-{stream}' + current-parameters: false + predefined-parameters: | + FUEL_VERSION=latest + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + OS_REGION=RegionTwo + REGIONONE_IP=10.2.117.79 + REGIONTWO_IP=10.2.117.181 + node-parameters: false + node-label-name: SLAVE_LABEL + node-label: intel-virtual6 + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: centralize-keystone + condition: SUCCESSFUL + projects: + - name: 'multisite-register-endpoints-{stream}' + current-parameters: false + predefined-parameters: | + OS_REGION=RegionOne + REGIONONE_IP=10.2.117.79 + REGIONTWO_IP=10.2.117.181 + node-parameters: false + node-label-name: SLAVE_LABEL + node-label: intel-virtual2 + kill-phase-on: FAILURE + abort-all-job: true + - name: 'multisite-update-auth-{stream}' + current-parameters: false + predefined-parameters: | + OS_REGION=RegionTwo + REGIONONE_IP=10.2.117.79 + REGIONTWO_IP=10.2.117.181 + node-parameters: false + node-label-name: SLAVE_LABEL + node-label: intel-virtual6 + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: kingbird-deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'multisite-kingbird-deploy-virtual-{stream}' + current-parameters: false + predefined-parameters: | + OS_REGION=RegionOne + REGIONONE_IP=10.2.117.79 + REGIONTWO_IP=10.2.117.181 + node-parameters: false + node-label-name: SLAVE_LABEL + node-label: intel-virtual2 + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: kingbird-functest + condition: SUCCESSFUL + projects: + - name: 'multisite-kingbird-functest-{stream}' + current-parameters: false + predefined-parameters: | + OS_REGION=RegionOne + REGIONONE_IP=10.2.117.79 + REGIONTWO_IP=10.2.117.181 + node-parameters: false + node-label-name: SLAVE_LABEL + node-label: intel-virtual2 + kill-phase-on: NEVER + abort-all-job: false + +- job-template: + name: 'multisite-{phase}-{stream}' + + concurrent: false + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'multisite-{phase}-builder': + stream: '{stream}' + + publishers: + - 'multisite-{phase}-publisher' + +######################## +# builder macros +######################## +- builder: + name: 'multisite-fuel-deploy-regionone-virtual-builder' + builders: + - shell: | + #!/bin/bash + + echo "This is where we deploy fuel, extract passwords and save into file" +- builder: + name: 'multisite-fuel-deploy-regiontwo-virtual-builder' + builders: + - shell: | + #!/bin/bash + + echo "This is where we deploy fuel, extract publicUrl, privateUrl, and adminUrl and save into file" +- builder: + name: 'multisite-register-endpoints-builder' + builders: + - copyartifact: + project: 'multisite-fuel-deploy-regiontwo-virtual-{stream}' + which-build: multijob-build + filter: "RegionTwo-Endpoints.txt" + - shell: | + #!/bin/bash + + echo "This is where we register RegionTwo in RegionOne keystone" +- builder: + name: 'multisite-update-auth-builder' + builders: + - copyartifact: + project: 'multisite-fuel-deploy-regionone-virtual-{stream}' + which-build: multijob-build + filter: "RegionOne-Passwords.txt" + - shell: | + #!/bin/bash + + echo "This is where we read passwords from RegionOne-passwords.txt and replace passwords in RegionTwo" +- builder: + name: 'multisite-kingbird-deploy-virtual-builder' + builders: + - shell: | + #!/bin/bash + + echo "This is where we install kingbird" +- builder: + name: 'multisite-kingbird-functest-builder' + builders: + - shell: | + #!/bin/bash + + echo "This is where we run kingbird-functest" +######################## +# publisher macros +######################## +- publisher: + name: 'multisite-fuel-deploy-regionone-virtual-publisher' + publishers: + - archive: + artifacts: '/root/servicepass.ini' + allow-empty: false + only-if-success: true + fingerprint: true +- publisher: + name: 'multisite-fuel-deploy-regiontwo-virtual-publisher' + publishers: + - archive: + artifacts: '/root/endpoints.ini' + allow-empty: false + only-if-success: true + fingerprint: true +- publisher: + name: 'multisite-register-endpoints-publisher' + publishers: + - archive: + artifacts: 'dummy.txt' + allow-empty: true +- publisher: + name: 'multisite-update-auth-publisher' + publishers: + - archive: + artifacts: 'dummy.txt' + allow-empty: true +- publisher: + name: 'multisite-kingbird-deploy-virtual-publisher' + publishers: + - archive: + artifacts: 'dummy.txt' + allow-empty: true +- publisher: + name: 'multisite-kingbird-functest-publisher' + publishers: + - archive: + artifacts: 'dummy.txt' + allow-empty: true diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index b46960fa7..dd0c97996 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -660,6 +660,16 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to be used' +- parameter: + name: 'multisite-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'multisite-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' ##################################################### # These slaves are just dummy slaves for sandbox jobs ##################################################### diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml index 722a9beb3..f192e8679 100644 --- a/jjb/qtip/qtip-project-jobs.yml +++ b/jjb/qtip/qtip-project-jobs.yml @@ -59,4 +59,9 @@ builders: - shell: | - echo "Nothing to verify!" + #!/bin/bash + set -o errexit + set -o pipefail + set -o xtrace + + tox diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 0cc6cd606..abc6eeb4b 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -122,7 +122,7 @@ # install python packages easy_install -U setuptools easy_install -U pip - pip install -r requirements.txt + pip install -r requirements.txt || pip install -r tests/ci/requirements.txt pip install -e . # unit tests |