summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------global-jjb0
-rw-r--r--jjb/fuel/fuel-daily-jobs.yaml26
-rwxr-xr-xjjb/functest/functest-alpine.sh30
-rw-r--r--jjb/functest/functest-docker.yaml4
-rwxr-xr-xjjb/functest/functest-k8.sh33
-rw-r--r--jjb/global/releng-defaults.yaml6
-rw-r--r--jjb/releng/opnfv-docker-arm.yaml6
-rw-r--r--jjb/releng/opnfv-docker.yaml8
-rw-r--r--jjb/releng/releng-info-vote.yaml6
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yaml73
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yaml6
-rw-r--r--jjb/yardstick/yardstick-rtd-jobs.yaml2
-rw-r--r--releases/hunter/fuel.yaml19
-rw-r--r--releases/hunter/stor4nfv.yaml9
-rwxr-xr-xutils/jenkins-jnlp-connect.sh2
15 files changed, 132 insertions, 98 deletions
diff --git a/global-jjb b/global-jjb
-Subproject 1a45fc8ab4c2022ce42400b769aaad302baefd8
+Subproject 623134d6449371e8bc28095e53abc051bbb6b4a
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 6717b7886..154259fa2 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -88,6 +88,8 @@
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-fdio-noha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+ - 'k8-calico-nofeature-noha':
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
exclude:
# Dovetail (and only it) should run against Fraser HA baremetal scenarios
@@ -107,6 +109,8 @@
stream: fraser
- scenario: os-nosdn-fdio-noha
stream: fraser
+ - scenario: k8-calico-nofeature-noha
+ stream: fraser
- scenario: os-ovn-nofeature-ha
stream: fraser
- scenario: os-nosdn-fdio-ha
@@ -137,7 +141,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'fuel-os-.*?-{pod}-daily-.*'
+ - 'fuel-(os|k8)-.*?-{pod}-daily-.*'
- 'fuel-verify-.*'
blocking-level: 'NODE'
@@ -439,6 +443,10 @@
name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-master-trigger'
triggers:
- timed: '5 20 * * 3,5'
+- trigger:
+ name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-master-trigger'
+ triggers:
+ - timed: ''
# ----------------------------------------------
# Triggers for job running on fuel-baremetal against gambia branch
# ----------------------------------------------
@@ -496,6 +504,10 @@
name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-gambia-trigger'
triggers:
- timed: '0 20 * * 3,5'
+- trigger:
+ name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-gambia-trigger'
+ triggers:
+ - timed: ''
# ----------------------------------------------
# Triggers for job running on fuel-virtual against master branch
# ----------------------------------------------
@@ -552,6 +564,10 @@
name: 'fuel-os-nosdn-fdio-noha-virtual-daily-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-k8-calico-nofeature-noha-virtual-daily-master-trigger'
+ triggers:
+ - timed: '5 16 * * *'
# ----------------------------------------------
# Triggers for job running on fuel-baremetal against fraser branch (for Dovetail)
# ----------------------------------------------
@@ -623,6 +639,10 @@
name: 'fuel-os-nosdn-fdio-noha-virtual-daily-gambia-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-k8-calico-nofeature-noha-virtual-daily-gambia-trigger'
+ triggers:
+ - timed: ''
# ----------------------------------------------
# ZTE POD1 Triggers running against master branch
# ----------------------------------------------
@@ -679,3 +699,7 @@
name: 'fuel-os-nosdn-fdio-noha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-k8-calico-nofeature-noha-zte-pod1-daily-master-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 18fec99ad..b2a976474 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -253,6 +253,36 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \
${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \
-v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml"
+if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
+ blacklist_yaml=$(mktemp)
+ cat << EOF >> "${blacklist_yaml}"
+---
+-
+ scenarios:
+ - os-ovn-nofeature-ha
+ tests:
+ - neutron_tempest_plugin.api.admin.test_agent_management
+ - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler
+ - patrole_tempest_plugin.tests.api.network.test_agents_rbac
+ - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
+ - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
+ - tempest.api.network.admin.test_agent_management
+ - tempest.api.network.admin.test_dhcp_agent_scheduler
+ - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+-
+ scenarios:
+ - os-nosdn-nofeature-ha
+ tests:
+ - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+-
+ scenarios:
+ - os-nosdn-nofeature-noha
+ tests:
+ - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+EOF
+ volumes="${volumes} -v ${blacklist_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml"
+fi
+
ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
echo 0 > ${ret_val_file}
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index dc833f5cd..328ef7c6c 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -202,9 +202,9 @@
#!/bin/bash -ex
case "{arch_tag}" in
"arm64")
- sudo amd64_dirs= arm64_dirs=docker/{image} bash ./build.sh ;;
+ sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;;
*)
- sudo amd64_dirs=docker/{image} arm64_dirs= bash ./build.sh ;;
+ sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
esac
exit $?
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index a4d80e10b..44f6d6ca6 100755
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -7,45 +7,20 @@ set +o pipefail
[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
FUNCTEST_DIR=/home/opnfv/functest
-rc_file=${HOME}/k8.creds
-sudo rm -rf $rc_file
-
-if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
- admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
- echo "export KUBERNETES_PROVIDER=local" >> $rc_file
- KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}')
- echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file
- KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2')
- echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file
-elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then
- admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config"
- rc_file=${HOME}/joid_config/k8config
-elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
- admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
- KUBE_MASTER_URL=$(awk '/server:/ {print $2}' ${HOME}/admin.conf | grep -Fv localhost)
- KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL | grep -Po '(\d+\.){3}\d+')
- for k in KUBE_MASTER_URL KUBE_MASTER_IP; do
- echo "export $k=${!k}" >> $rc_file
- done
-else
- echo "Not supported by other installers yet"
- exit 1
-fi
-
-rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
+admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}"
mkdir -p ${dir_result}
sudo rm -rf ${dir_result}/*
results_vol="-v ${dir_result}:${FUNCTEST_DIR}/results"
-volumes="${rc_file_vol} ${results_vol} ${admin_conf_file_vol}"
+volumes="${results_vol} ${admin_conf_file_vol}"
envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} \
-e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
- -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
+ -e BUILD_TAG=${BUILD_TAG}"
-DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}`
+DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})}
set +e
diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml
index e584107c8..a6ee7fa3d 100644
--- a/jjb/global/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yaml
@@ -17,6 +17,12 @@
gerrit-server-name: 'gerrit.opnfv.org'
jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
lftools-version: '<1.0.0'
+ throttle_categories: []
+ throttle-enabled: true
+ throttle-max-per-node: 1
+ throttle-max-total: 2
+ throttle-option: project
+
properties:
- logrotate-default
diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index 102069ad9..6ec3c8992 100644
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -23,6 +23,10 @@
stream: gambia
branch: 'stable/{stream}'
disabled: false
+ hunter: &hunter
+ stream: hunter
+ branch: 'stable/{stream}'
+ disabled: false
dovetail-arm-receivers: &dovetail-arm-receivers
receivers: >
cristina.pauna@enea.com
@@ -134,7 +138,7 @@
<<: *storperf-arm-receivers
- 'yardstick':
project: 'yardstick'
- <<: *gambia
+ <<: *hunter
<<: *yardstick-arm-receivers
# yamllint enable rule:key-duplicates
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 14583393e..5b3dae949 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -27,6 +27,10 @@
stream: gambia
branch: 'stable/{stream}'
disabled: false
+ hunter: &hunter
+ stream: hunter
+ branch: 'stable/{stream}'
+ disabled: false
pharos-tools-receivers: &pharos_tools_receivers
receivers: >
pberberian@iol.unh.edu
@@ -36,9 +40,7 @@
mark.beierl@emc.com
yardstick-receivers: &yardstick-receivers
receivers: >
- limingjiang@huawei.com
rexlee8776@gmail.com
- emma.l.foley@intel.com
other-receivers: &other-receivers
receivers: ''
@@ -370,7 +372,7 @@
<<: *storperf-receivers
- 'yardstick':
project: 'yardstick'
- <<: *gambia
+ <<: *hunter
<<: *yardstick-receivers
# projects with jobs for fraser
- 'bottlenecks':
diff --git a/jjb/releng/releng-info-vote.yaml b/jjb/releng/releng-info-vote.yaml
new file mode 100644
index 000000000..83818585a
--- /dev/null
+++ b/jjb/releng/releng-info-vote.yaml
@@ -0,0 +1,6 @@
+---
+- project:
+ name: info-vote
+ build-node: lf-build2
+ jobs:
+ - 'info-vote-verify'
diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml
index 1c622acf2..bab3ce9c5 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yaml
+++ b/jjb/yardstick/yardstick-daily-jobs.yaml
@@ -15,28 +15,11 @@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- gambia: &gambia
- stream: gambia
+ hunter: &hunter
+ stream: hunter
branch: 'stable/{stream}'
gs-pathname: '{stream}'
docker-tag: 'stable'
- # Temporary fraser entry, until all fraser-tied PODs below migrate to gambia
- fraser: &fraser
- stream: fraser
- branch: 'stable/{stream}'
- gs-pathname: '{stream}'
- # In the meantime, docker image 'stable' will carry gambia contents, and
- # there is no implemented way to build a docker image with 'fraser' tag.
- # Available docker image tag options, as of 2018-10-03:
- # - 'opnfv-6.2.1', built on 2018-07-02, is rather old.
- # - 'ovp-2.0.0', built on 2018-09-21, is a good fit despite its name: it
- # was built using SHA1 6c10a2d9cc3fe10e0bdd73a0985ab767b9479afc, which
- # is the same as used for the most recent 'stable' docker image carrying
- # fraser contents, built on 2018-09-13 and used so far by the fraser-
- # tied PODs below.
- # The alternative would be to create a new 'opnfv-6.2.2' git tag, but that
- # would just build another image using the same SHA1 as for 'ovp-2.0.0'.
- docker-tag: 'ovp-2.0.0'
# -------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
# -------------------------------
@@ -61,22 +44,12 @@
slave-label: apex-virtual-master
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
- 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'
- <<: *fraser
- - baremetal:
- slave-label: apex-baremetal-fraser
- installer: apex
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *hunter
# fuel CI PODs
- baremetal:
slave-label: fuel-baremetal
@@ -92,12 +65,12 @@
slave-label: fuel-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
- virtual:
slave-label: fuel-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@ -113,12 +86,12 @@
slave-label: armband-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
- armband-virtual:
slave-label: armband-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@ -134,12 +107,12 @@
slave-label: joid-baremetal
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *hunter
- virtual:
slave-label: joid-virtual
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *hunter
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@ -155,22 +128,12 @@
slave-label: compass-baremetal
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
- - virtual:
- slave-label: compass-virtual
- installer: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
- - baremetal:
- slave-label: compass-baremetal
- installer: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
- virtual:
slave-label: compass-virtual
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
# daisy CI PODs
- baremetal:
slave-label: daisy-baremetal
@@ -181,7 +144,7 @@
slave-label: daisy-baremetal
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *hunter
- virtual:
slave-label: daisy-virtual
installer: daisy
@@ -204,7 +167,7 @@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *gambia
+ <<: *hunter
- zte-pod2:
slave-label: '{pod}'
installer: daisy
@@ -219,7 +182,7 @@
slave-label: '{pod}'
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *hunter
- zte-pod9:
slave-label: '{pod}'
installer: daisy
@@ -229,7 +192,7 @@
slave-label: '{pod}'
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *hunter
- orange-pod2:
slave-label: '{pod}'
installer: joid
@@ -387,7 +350,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-apex-virtual-fraser'
+ name: 'yardstick-params-apex-virtual-hunter'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
@@ -395,7 +358,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-apex-baremetal-fraser'
+ name: 'yardstick-params-apex-baremetal-hunter'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index ace2e0265..726760ef5 100644
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -17,11 +17,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - gambia: &gambia
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- - fraser:
+ - hunter: &hunter
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml
index a18a6550b..213ec6ac2 100644
--- a/jjb/yardstick/yardstick-rtd-jobs.yaml
+++ b/jjb/yardstick/yardstick-rtd-jobs.yaml
@@ -12,7 +12,7 @@
- master:
branch: '{stream}'
disabled: false
- - gambia:
+ - hunter:
branch: 'stable/{stream}'
disabled: false
diff --git a/releases/hunter/fuel.yaml b/releases/hunter/fuel.yaml
new file mode 100644
index 000000000..a97b97dd9
--- /dev/null
+++ b/releases/hunter/fuel.yaml
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: fuel
+project-type: installer
+release-model: stable
+
+branches:
+ - name: stable/hunter
+ location:
+ fuel: f021e19b4797eb4f6830d86056fce919f1e1fe01
+
+release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html
diff --git a/releases/hunter/stor4nfv.yaml b/releases/hunter/stor4nfv.yaml
new file mode 100644
index 000000000..8d7fb2208
--- /dev/null
+++ b/releases/hunter/stor4nfv.yaml
@@ -0,0 +1,9 @@
+---
+project: stor4nfv
+project-type: feature
+release-model: stable
+
+branches:
+ - name: stable/hunter
+ location:
+ stor4nfv: fe427fc3f69ecc5e104a6fdb2c9f5d82f0254fdb
diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh
index 17c03b070..4716af9a2 100755
--- a/utils/jenkins-jnlp-connect.sh
+++ b/utils/jenkins-jnlp-connect.sh
@@ -218,5 +218,5 @@ do
done
jenkins_hostname="${jenkins_hostname:-build.opnfv.org/ci}"
-connectionstring="java -jar agent.jar -jnlpUrl https://"$jenkins_hostname"/computer/"$agent_name"/agent-agent.jnlp -secret "$agent_secret" -noCertificateCheck "
+connectionstring="java -jar agent.jar -jnlpUrl https://"$jenkins_hostname"/computer/"$agent_name"/slave-agent.jnlp -secret "$agent_secret" -noCertificateCheck "
main "$@"