summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global/slave-params.yml13
-rwxr-xr-xjjb/infra/bifrost-verify.sh35
-rw-r--r--jjb/opera/opera-daily-jobs.yml30
-rw-r--r--jjb/releng/testapi-automate.yml2
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml2
5 files changed, 62 insertions, 20 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 9d08487a3..d05b7b562 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -439,6 +439,19 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- parameter:
+ name: 'huawei-virtual7-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - huawei-virtual7
+ default-slaves:
+ - huawei-virtual7
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+- parameter:
name: 'huawei-pod7-defaults'
parameters:
- node:
diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index 48f916e72..a7ef9c43f 100755
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -24,16 +24,17 @@ function upload_logs() {
gsutil -q cp -Z ${WORKSPACE}/build_log.txt ${BIFROST_GS_URL}/build_log.txt
rm ${WORKSPACE}/build_log.txt
- [[ ! -d ${WORKSPACE}/logs ]] && return 0
-
- pushd ${WORKSPACE}/logs/ &> /dev/null
- for x in *.log; do
- echo "Compressing and uploading $x"
- gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x}
- done
+ if [[ -d ${WORKSPACE}/logs ]]; then
+ pushd ${WORKSPACE}/logs &> /dev/null
+ for x in *.log; do
+ echo "Compressing and uploading $x"
+ gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x}
+ done
+ popd &> /dev/null
+ fi
echo "Generating the landing page"
- cat > index.html <<EOF
+ cat > ${WORKSPACE}/index.html <<EOF
<html>
<h1>Build results for <a href=https://$GERRIT_NAME/#/c/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER>$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER</a></h1>
<h2>Job: $JOB_NAME</h2>
@@ -41,20 +42,22 @@ function upload_logs() {
<li><a href=${BIFROST_LOG_URL}/build_log.txt>build_log.txt</a></li>
EOF
- for x in *.log; do
- echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> index.html
- done
+ if [[ -d ${WORKSPACE}/logs ]]; then
+ pushd ${WORKSPACE}/logs &> /dev/null
+ for x in *.log; do
+ echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> ${WORKSPACE}/index.html
+ done
+ popd &> /dev/null
+ fi
- cat >> index.html << EOF
+ cat >> ${WORKSPACE}/index.html << EOF
</ul>
</html>
EOF
- gsutil -q cp index.html ${BIFROST_GS_URL}/index.html
-
- rm index.html
+ gsutil -q cp ${WORKSPACE}/index.html ${BIFROST_GS_URL}/index.html
- popd &> /dev/null
+ rm ${WORKSPACE}/index.html
}
function fix_ownership() {
diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml
index 76aeb741e..b0755446e 100644
--- a/jjb/opera/opera-daily-jobs.yml
+++ b/jjb/opera/opera-daily-jobs.yml
@@ -63,7 +63,9 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'huawei-pod7-defaults'
+ - 'huawei-virtual7-defaults'
+ - 'compass-defaults'
+ - 'opera-compass-parameter'
builders:
- description-setter:
@@ -81,7 +83,7 @@
name: deploy
condition: SUCCESSFUL
projects:
- - name: 'opera-daily-deploy-{stream}'
+ - name: 'compass-deploy-virtual-daily-{stream}'
current-parameters: true
node-parameters: true
kill-phase-on: FAILURE
@@ -143,3 +145,27 @@
#!/bin/bash
echo "Hello world!"
+########################
+# parameter macros
+########################
+- parameter:
+ name: opera-compass-parameter
+ parameters:
+ - string:
+ name: BUILD_DIRECTORY
+ default: $WORKSPACE/build_output
+ description: "Directory where the build artifact will be located upon the completion of the build."
+ - string:
+ name: GS_URL
+ default: '$GS_BASE{gs-pathname}'
+ description: "URL to Google Storage."
+ - choice:
+ name: COMPASS_OPENSTACK_VERSION
+ choices:
+ - 'newton'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-openo-noha'
+ - string:
+ name: COMPASS_OS_VERSION
+ default: 'xenial'
diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml
index 24e9b8649..abb3481ed 100644
--- a/jjb/releng/testapi-automate.yml
+++ b/jjb/releng/testapi-automate.yml
@@ -44,7 +44,7 @@
branch-pattern: '**/{branch}'
file-paths:
- compare-type: 'ANT'
- pattern: 'utils/**'
+ pattern: 'utils/test/testapi/**'
builders:
- run-unit-tests
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index a54750ef7..1da4f3134 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -116,7 +116,7 @@
source $WORKSPACE/yardstick_venv/bin/activate
# install python packages
- easy_install -U setuptools
+ easy_install -U setuptools==33.1.1
easy_install -U pip
pip install -r requirements.txt || pip install -r tests/ci/requirements.txt
pip install -e .