summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml12
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml9
-rw-r--r--jjb/fuel/fuel-project-jobs.yml19
-rw-r--r--jjb/functest/functest-ci-jobs.yml8
-rw-r--r--jjb/joid/joid-ci-jobs.yml2
-rw-r--r--jjb/joid/joid-deploy.sh14
-rw-r--r--jjb/opnfv/slave-params.yml11
7 files changed, 46 insertions, 29 deletions
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 25ea676e2..2f0c13329 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -8,9 +8,11 @@
stream:
- master:
+ slave_name: 'huawei-us-deploy-vm-1'
branch: '{stream}'
gs-pathname: ''
- brahmaputra:
+ slave_name: 'huawei-us-deploy-vm-2'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
@@ -30,9 +32,9 @@
disabled: false
- node: 'huawei-virtual'
+ node: '{slave_name}'
- concurrent: true
+ concurrent: false
wrappers:
- timeout:
@@ -58,11 +60,15 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - '{node}-defaults'
+ #- '{node}-defaults'
- '{installer}-defaults'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
triggers:
- gerrit:
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index d293554c2..cf421356a 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -45,13 +45,14 @@
scenario:
# HA scenarios
- 'os-onos-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+# auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-odl_l2-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-odl_l3-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-odl_l2-bgpvpn-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-nosdn-nofeature-ha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-nosdn-kvm-ha':
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 2e30fb1e6..1231bfe15 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -40,7 +40,7 @@
parameters:
- project-parameter:
project: '{project}'
- - 'ericsson-ca-build-1-defaults'
+ - 'fuel-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
@@ -77,17 +77,12 @@
concurrent: true
- properties:
- - throttle:
- enabled: true
- max-total: 3
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'ericsson-ca-build-1-defaults'
+ - 'fuel-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
@@ -146,20 +141,16 @@
concurrent: true
- properties:
- - throttle:
- enabled: true
- max-total: 2
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'ericsson-ca-build-1-defaults'
+ - 'fuel-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -209,7 +200,7 @@
concurrent: true
- disabled: false
+ disabled: true
properties:
- throttle:
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 2b91ed692..10ea72b53 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -243,13 +243,13 @@
sudo rm -rf ${dir_result}/*
res_volume="-v ${dir_result}:/home/opnfv/functest/results"
- docker pull opnfv/functest:latest_stable >$redirect
- cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
+ docker pull opnfv/functest:latest >$redirect
+ cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd}
docker ps -a
sleep 5
- container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)
+ container_id=$(docker ps | grep 'opnfv/functest:latest' | awk '{print $1}' | head -1)
echo "Container ID=${container_id}"
if [ -z ${container_id} ]; then
echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
@@ -260,7 +260,7 @@
docker start ${container_id}
sleep 5
docker ps
- if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then
+ if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then
echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
exit 1
fi
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 849112319..946785d91 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -103,7 +103,7 @@
builders:
- trigger-builds:
- project: 'joid-deploy-{pod}-daily-{stream}'
- current-parameters: false
+ current-parameters: true
predefined-parameters:
DEPLOY_SCENARIO={scenario}
same-node: true
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index cdf92a785..9d15390b3 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -127,7 +127,7 @@ SRCBUNDLE="${SRCBUNDLE}/ovs-${SDN_CONTROLLER}-${HA_MODE}.yaml"
# Modify Bundle
echo "------ Set openstack password ------"
-sed -i -- "s/\"admin-password\": openstack/\"admin-password\": $OS_ADMIN_PASSWORD/" $SRCBUNDLE
+sed -i -- "s/admin-password: openstack/admin-password: $OS_ADMIN_PASSWORD/" $SRCBUNDLE
if [ -n "$EXTNET_NAME" ]; then
echo "------ Set openstack default network ------"
@@ -162,8 +162,16 @@ exit_on_error $? "Main deploy FAILED"
JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
-# get Keystone vip
-KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+# get Keystone ip
+case "$HA_MODE" in
+ "ha")
+ KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+ ;;
+ *)
+ KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //')
+ ;;
+esac
+
# get controller IP
case "$SDN_CONTROLLER" in
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 5204f7926..414853784 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -430,6 +430,17 @@
description: 'Git URL to use on these Jenkins Slaves'
- parameter:
+ name: 'fuel-build-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'fuel-build'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on these Jenkins Slaves'
+
+- parameter:
name: 'intel-us-deploy-virtual-2-defaults'
parameters:
- node: