summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/apex/apex-deploy.sh4
-rw-r--r--jjb/apex/apex.yaml9
-rw-r--r--jjb/apex/apex.yaml.j29
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh5
-rw-r--r--jjb/doctor/doctor.yaml6
-rwxr-xr-xjjb/dovetail/dovetail-run.sh140
-rwxr-xr-xjjb/functest/functest-alpine.sh21
-rw-r--r--jjb/functest/functest-daily-jobs.yaml9
-rw-r--r--jjb/global/releng-defaults.yaml1
-rw-r--r--jjb/releng/compass4nfv-docker.yaml18
-rw-r--r--jjb/releng/opnfv-docker.yaml6
-rw-r--r--jjb/releng/opnfv-utils.yaml1
-rw-r--r--jjb/releng/releng-ci-jobs.yaml1
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yaml20
14 files changed, 167 insertions, 83 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 1bc727d32..4876b8504 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -141,8 +141,8 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then
fi
if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then
- if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then
- CSIT_ENV="csit-queens-environment.yaml"
+ if [[ "$OS_VERSION" != "master" ]]; then
+ CSIT_ENV="csit-${OS_VERSION}-environment.yaml"
else
CSIT_ENV="csit-environment.yaml"
fi
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 26f282f98..15fab23c6 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -447,6 +447,7 @@
- 'apex-virtual-.*'
- 'apex-verify-gate-.*'
- 'odl-netvirt.*'
+ - 'apex-.*-promote.*'
- throttle:
max-per-node: 1
max-total: 10
@@ -884,7 +885,7 @@
description: "Used for overriding the PROMOTE"
- string:
name: GS_URL
- default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+ default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}'
description: "User for overriding GS_URL from apex params"
- string:
name: OS_VERSION
@@ -894,7 +895,10 @@
name: ODL_BRANCH
default: '{odl_branch}'
description: ODL branch being used
-
+ - string:
+ name: FORCE_PROMOTE
+ default: 'False'
+ description: "Used to force promotion and skip CSIT"
properties:
- build-blocker:
use-build-blocker: true
@@ -954,6 +958,7 @@
SSH_KEY_PATH=/tmp/csit/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
+ SKIP_CSIT=$FORCE_PROMOTE
node-parameters: true
kill-phase-on: NEVER
abort-all-job: false
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index b302cda32..5c934c44d 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -293,6 +293,7 @@
- 'apex-virtual-.*'
- 'apex-verify-gate-.*'
- 'odl-netvirt.*'
+ - 'apex-.*-promote.*'
- throttle:
max-per-node: 1
max-total: 10
@@ -730,7 +731,7 @@
description: "Used for overriding the PROMOTE"
- string:
name: GS_URL
- default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+ default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}'
description: "User for overriding GS_URL from apex params"
- string:
name: OS_VERSION
@@ -740,7 +741,10 @@
name: ODL_BRANCH
default: '{odl_branch}'
description: ODL branch being used
-
+ - string:
+ name: FORCE_PROMOTE
+ default: 'False'
+ description: "Used to force promotion and skip CSIT"
properties:
- build-blocker:
use-build-blocker: true
@@ -800,6 +804,7 @@
SSH_KEY_PATH=/tmp/csit/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
+ SKIP_CSIT=$FORCE_PROMOTE
node-parameters: true
kill-phase-on: NEVER
abort-all-job: false
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index abd62a39d..892f0aa7a 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -4,6 +4,11 @@ set -o errexit
set -o nounset
set -o pipefail
+if [[ ! -z ${SKIP_CSIT+x} && "$SKIP_CSIT" == "True" ]]; then
+ echo "Skipping csit run"
+ exit 0
+fi
+
if [ "$OS_VERSION" == 'master' ]; then
FULL_OS_VER='master'
else
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index c79210e15..2d5fe0ef2 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -14,7 +14,11 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - fraser: &fraser
+ - gambia: &gambia
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 5fe3d36bb..04b11fdd1 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -29,6 +29,7 @@ mkdir -p ${DOVETAIL_IMAGES}
OPENRC=${DOVETAIL_CONFIG}/env_config.sh
CACERT=${DOVETAIL_CONFIG}/os_cacert
+POD=${DOVETAIL_CONFIG}/pod.yaml
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
@@ -36,9 +37,9 @@ sshkey=""
check_file_exists() {
if [[ -f $1 ]]; then
- return 0
+ echo 0
else
- return 1
+ echo 1
fi
}
@@ -91,8 +92,12 @@ get_joid_cred_file() {
}
change_cred_file_cacert_path() {
- check_file_exists ${CACERT}
- if [[ $? == 0 ]]; then
+ if [[ ${INSTALLER_TYPE} == "apex" ]]; then
+ echo "INFO: apex doesn't need to set OS_CACERT."
+ return 0
+ fi
+ exists=`check_file_exists ${CACERT}`
+ if [[ $exists == 0 ]]; then
echo "INFO: set ${INSTALLER_TYPE} openstack cacert file to be ${CACERT}"
if [[ ${INSTALLER_TYPE} == "compass" ]]; then
echo "export OS_CACERT=${CACERT}" >> ${OPENRC}
@@ -100,18 +105,18 @@ change_cred_file_cacert_path() {
sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC}
fi
else
- echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
+ echo "ERROR: cannot find file ${CACERT}. Please check if it exists."
sudo ls -al ${DOVETAIL_CONFIG}
exit 1
fi
}
change_cred_file_ext_net() {
- check_file_exists ${OPENRC}
- if [[ $? == 0 ]]; then
+ exists=`check_file_exists ${OPENRC}`
+ if [[ $exists == 0 ]]; then
echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC}
else
- echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
+ echo "ERROR: cannot find file $OPENRC. Please check if it exists."
sudo ls -al ${DOVETAIL_CONFIG}
exit 1
fi
@@ -128,32 +133,26 @@ get_cred_file() {
get_joid_cred_file
fi
- check_file_exists ${OPENRC}
- if [[ $? == 0 ]]; then
- echo "INFO: original openstack credentials file is"
+ exists=`check_file_exists ${OPENRC}`
+ if [[ $exists == 0 ]]; then
+ echo "INFO: original openstack credentials file is:"
cat $OPENRC
echo "INFO: change cacert file path in credentials file"
change_cred_file_cacert_path
echo "INFO: set external network in credentials file"
change_cred_file_ext_net
- echo "INFO: final openstack credentials file is"
+ echo "INFO: final openstack credentials file is:"
cat $OPENRC
else
- echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
+ echo "ERROR: cannot find file $OPENRC. Please check if it exists."
sudo ls -al ${DOVETAIL_CONFIG}
exit 1
fi
}
-get_cred_file
-
-# These packages are used for parsing yaml files and decrypting ipmi user and password.
-sudo pip install shyaml
-sudo yum install -y rubygems || sudo apt-get install -y ruby
-sudo gem install hiera-eyaml
-
-if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then
+get_compass_pod_file() {
compass_repo=${WORKSPACE}/compass4nfv/
+ echo "INFO: clone compass repo..."
git clone https://github.com/opnfv/compass4nfv.git ${compass_repo} >/dev/null
scenario_file=${compass_repo}/deploy/conf/hardware_environment/$NODE_NAME/os-nosdn-nofeature-ha.yml
ipmiIp=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiIp)
@@ -161,7 +160,7 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then
ipmiUser=root
jumpserver_ip=$(ifconfig | grep -A 5 docker0 | grep "inet addr" | cut -d ':' -f 2 | cut -d ' ' -f 1)
- cat << EOF >${DOVETAIL_CONFIG}/pod.yaml
+ cat << EOF >${POD}
nodes:
- {ip: ${jumpserver_ip}, name: node0, password: root, role: Jumpserver, user: root}
- {ip: 10.1.0.50, name: node1, password: root, role: controller, user: root,
@@ -172,9 +171,10 @@ nodes:
- {ip: 10.1.0.54, name: node5, password: root, role: compute, user: root}
EOF
-fi
-if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
+}
+
+get_fuel_baremetal_pod_file() {
fuel_ctl_ssh_options="${ssh_options} -i ${SSH_KEY}"
ssh_user="ubuntu"
fuel_ctl_ip=$(ssh 2>/dev/null ${fuel_ctl_ssh_options} "${ssh_user}@${INSTALLER_IP}" \
@@ -202,7 +202,7 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_T
[[ $ipmiUser == ENC* ]] && ipmiUser=$(eyaml decrypt -s ${ipmiUser//[[:blank:]]/})
[[ $ipmiPass == ENC* ]] && ipmiPass=$(eyaml decrypt -s ${ipmiPass//[[:blank:]]/})
- cat << EOF >${DOVETAIL_CONFIG}/pod.yaml
+ cat << EOF >${POD}
nodes:
- {ip: ${INSTALLER_IP}, name: node0, key_filename: /home/opnfv/userconfig/pre_config/id_rsa,
role: Jumpserver, user: ${ssh_user}}
@@ -212,11 +212,10 @@ nodes:
- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}}
- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}}
EOF
-fi
+}
-if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then
+get_pod_file_with_scripts() {
set +e
-
sudo pip install virtualenv
cd ${releng_repo}/modules
@@ -228,60 +227,95 @@ if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then
if [[ ${INSTALLER_TYPE} == compass ]]; then
options="-u root -p root"
elif [[ ${INSTALLER_TYPE} == fuel ]]; then
- options="-u root -p r00tme"
+ options="-u ubuntu -k /root/.ssh/id_rsa"
elif [[ ${INSTALLER_TYPE} == apex ]]; then
options="-u stack -k /root/.ssh/id_rsa"
elif [[ ${INSTALLER_TYPE} == daisy ]]; then
options="-u root -p r00tme"
else
- echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently."
- echo "HA test cases may not run properly."
+ echo "WARNING: Don't support to generate ${POD} on ${INSTALLER_TYPE} currently."
+ echo "WARNING: HA test cases may not run properly."
fi
cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \
- -i ${INSTALLER_IP} ${options} -f ${DOVETAIL_CONFIG}/pod.yaml \
+ -i ${INSTALLER_IP} ${options} -f ${POD} \
-s /home/opnfv/userconfig/pre_config/id_rsa"
- echo ${cmd}
+ echo "INFO: cmd is ${cmd}"
${cmd}
deactivate
-
set -e
-
cd ${WORKSPACE}
-fi
+}
-if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then
- sudo chmod 666 ${DOVETAIL_CONFIG}/pod.yaml
- echo "Adapt process info for $INSTALLER_TYPE ..."
- if [ "$INSTALLER_TYPE" == "apex" ]; then
- cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
+change_apex_pod_file_process_info() {
+ cat << EOF >> ${POD}
process_info:
- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server}
- {testcase_name: yardstick.ha.cinder_api, attack_process: cinder_wsgi}
EOF
- elif [ "$INSTALLER_TYPE" == "fuel" ]; then
- cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
+}
+
+change_fuel_pod_file_process_info() {
+ cat << EOF >> ${POD}
process_info:
- {testcase_name: yardstick.ha.cinder_api, attack_process: cinder-wsgi}
- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server, attack_host: msg01}
- {testcase_name: yardstick.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01}
- {testcase_name: yardstick.ha.database, attack_process: mysqld, attack_host: dbs01}
EOF
- elif [ "$INSTALLER_TYPE" == "compass" ]; then
- cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
+}
+
+change_compass_pod_file_process_info() {
+ cat << EOF >> ${POD}
process_info:
- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq}
EOF
+}
+
+change_pod_file_process_info() {
+ sudo chmod 666 ${POD}
+ echo "INFO: adapt process info for $INSTALLER_TYPE ..."
+ if [ "$INSTALLER_TYPE" == "apex" ]; then
+ change_apex_pod_file_process_info
+ elif [ "$INSTALLER_TYPE" == "fuel" ]; then
+ change_fuel_pod_file_process_info
+ elif [ "$INSTALLER_TYPE" == "compass" ]; then
+ change_compass_pod_file_process_info
fi
+}
- echo "file ${DOVETAIL_CONFIG}/pod.yaml:"
- cat ${DOVETAIL_CONFIG}/pod.yaml
-else
- echo "Error: cannot find file ${DOVETAIL_CONFIG}/pod.yaml. Please check if it is existing."
- sudo ls -al ${DOVETAIL_CONFIG}
- echo "HA test cases may not run properly."
-fi
+get_pod_file() {
+ # These packages are used for parsing yaml files and decrypting ipmi user and password.
+ sudo pip install shyaml
+ sudo yum install -y rubygems || sudo apt-get install -y ruby
+ sudo gem install hiera-eyaml
+ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
+ get_compass_pod_file
+ elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
+ get_fuel_baremetal_pod_file
+ fi
+
+ exists=`check_file_exists ${POD}`
+ if [[ $exists == 1 ]]; then
+ get_pod_file_with_scripts
+ fi
+
+ exists=`check_file_exists ${POD}`
+ if [[ $exists == 0 ]]; then
+ change_pod_file_process_info
+ else
+ echo "ERROR: cannot find file ${POD}. Please check if it exists."
+ sudo ls -al ${DOVETAIL_CONFIG}
+ exit 1
+ fi
+
+ echo "INFO: file ${POD} is:"
+ cat ${POD}
+}
+
+get_cred_file
+get_pod_file
if [ "$INSTALLER_TYPE" == "fuel" ]; then
if [[ "${SUT_BRANCH}" =~ "danube" ]]; then
@@ -376,7 +410,7 @@ sleep 5
container_id=$(docker ps | grep "${DOCKER_REPO}:${DOCKER_TAG}" | awk '{print $1}' | head -1)
echo "Container ID=${container_id}"
if [ -z ${container_id} ]; then
- echo "Cannot find ${DOCKER_REPO} container ID ${container_id}. Please check if it is existing."
+ echo "Cannot find ${DOCKER_REPO} container ID ${container_id}. Please check if it exists."
docker ps -a
exit 1
fi
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index a34f8a435..e8d81ea0c 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -135,10 +135,14 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
"sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
- IMAGE_PROPERTIES="hw_disk_bus: scsi, hw_scsi_model: virtio-scsi"
- envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\""
+ IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi"
+ envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
fi
+if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then
+ libvirt_vol="-v ${ssh_key}:${FUNCTEST_DIR}/conf/libvirt_key"
+ envs="${envs} -e LIBVIRT_USER=ubuntu -e LIBVIRT_KEY_PATH=${FUNCTEST_DIR}/conf/libvirt_key"
+fi
if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
ssh_key="/tmp/id_rsa"
@@ -152,15 +156,18 @@ fi
if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then
if [[ -n ${IMAGE_PROPERTIES} ]]; then
- IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large"
+ IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large"
else
- IMAGE_PROPERTIES="hw_mem_page_size: large"
+ IMAGE_PROPERTIES="hw_mem_page_size:large"
fi
- FLAVOR_EXTRA_SPECS="hw:mem_page_size: large"
- envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\""
+ FLAVOR_EXTRA_SPECS="hw:mem_page_size:large"
+fi
+
+if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then
+ envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}"
fi
-volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
+volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
echo 0 > ${ret_val_file}
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 1e380f2a2..3b3adabc2 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -112,6 +112,14 @@
installer: apex
<<: *master
- virtual:
+ slave-label: apex-virtual-master
+ installer: apex
+ <<: *gambia
+ - baremetal:
+ slave-label: apex-baremetal-master
+ installer: apex
+ <<: *gambia
+ - virtual:
slave-label: apex-virtual-fraser
installer: apex
<<: *fraser
@@ -251,6 +259,7 @@
- throttle:
enabled: true
max-per-node: 1
+ max-total: 10
option: 'project'
wrappers:
diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml
index 34c5fdde2..e584107c8 100644
--- a/jjb/global/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yaml
@@ -16,7 +16,6 @@
build-node: 'opnfv-build'
gerrit-server-name: 'gerrit.opnfv.org'
jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
- jjb-version: '2.2.1'
lftools-version: '<1.0.0'
properties:
diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index 7cedba916..2eb2a207c 100644
--- a/jjb/releng/compass4nfv-docker.yaml
+++ b/jjb/releng/compass4nfv-docker.yaml
@@ -198,14 +198,16 @@
#!/bin/bash -ex
case "{stream}" in
"master")
- tag="latest" ;;
+ sudo manifest-tool push from-args \
+ --platforms linux/amd64,linux/arm64 \
+ --template opnfv/compass-{image}:ARCH-latest \
+ --target opnfv/compass-{image}:latest ;;
*)
- tag="{stream}" ;;
+ sudo manifest-tool push from-args \
+ --platforms linux/amd64,linux/arm64 \
+ --template opnfv/compass-{image}:ARCH-stable \
+ --target opnfv/compass-{image}:{stream} ;;
esac
- sudo manifest-tool push from-args \
- --platforms linux/amd64,linux/arm64 \
- --template opnfv/compass-{image}:ARCH-$tag \
- --target opnfv/compass-{image}:$tag
exit $?
# parameter macro
@@ -256,9 +258,7 @@
publishers:
- email:
recipients: >
- chigang@huawei.com
- huangxiangyui5@huawei.com
- xueyifei@huawei.com
+ huangxiangyu5@huawei.com
wutianwei1@huawei.com
- publisher:
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 5b93b0f8d..9bbcdfea7 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -150,6 +150,12 @@
dockerfile: 'Dockerfile'
<<: *master
<<: *other-receivers
+ - 'clover-ns-modsecurity-crs':
+ project: 'clover'
+ dockerdir: 'samples/services/modsecurity/docker'
+ dockerfile: 'Dockerfile'
+ <<: *master
+ <<: *other-receivers
- 'cperf':
project: 'cperf'
<<: *master
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 3c5c07bb5..457f7dc2b 100644
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -28,7 +28,6 @@
- arm-build3
- arm-build4
- arm-build5
- - arm-build6
- ericsson-build3
- ericsson-build4
- lf-build2
diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-ci-jobs.yaml
index 17fb6e42c..f7c960335 100644
--- a/jjb/releng/releng-ci-jobs.yaml
+++ b/jjb/releng/releng-ci-jobs.yaml
@@ -3,6 +3,7 @@
name: releng-builder-jobs
project: 'releng'
project-name: 'releng'
+ jjb-version: '2.5.0'
build-timeout: 60
diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml
index e42dbedc1..a312338a5 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yaml
+++ b/jjb/yardstick/yardstick-daily-jobs.yaml
@@ -58,6 +58,16 @@
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- virtual:
+ slave-label: apex-virtual-master
+ installer: apex
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *gambia
+ - baremetal:
+ slave-label: apex-baremetal-master
+ installer: apex
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *gambia
+ - virtual:
slave-label: apex-virtual-fraser
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
@@ -82,12 +92,12 @@
slave-label: fuel-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *gambia
- virtual:
slave-label: fuel-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *gambia
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@ -103,12 +113,12 @@
slave-label: armband-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *gambia
- armband-virtual:
slave-label: armband-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *gambia
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@ -184,7 +194,7 @@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *gambia
- zte-pod2:
slave-label: '{pod}'
installer: daisy