summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xjjb/apex/apex-build.sh2
-rw-r--r--jjb/apex/apex.yaml86
-rw-r--r--jjb/apex/apex.yaml.j286
-rw-r--r--jjb/barometer/barometer.yaml2
-rw-r--r--jjb/cperf/cperf-ci-jobs.yaml11
-rwxr-xr-xjjb/functest/functest-alpine.sh2
-rw-r--r--jjb/releng/opnfv-docker.yaml6
-rw-r--r--jjb/xci/xci-daily-jobs.yaml4
-rwxr-xr-xjjb/xci/xci-run-functest.sh4
-rw-r--r--releases/gambia/clover.yaml9
-rw-r--r--releases/gambia/stor4nfv.yaml9
11 files changed, 189 insertions, 32 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh
index a8ed1f8b7..618d18110 100755
--- a/jjb/apex/apex-build.sh
+++ b/jjb/apex/apex-build.sh
@@ -67,7 +67,7 @@ fi
if ! echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then
echo "Writing opnfv.properties file"
- if [ "$BRANCH" != master ]; then
+ if [ "$BRANCH" == 'stable/fraser' ]; then
# save information regarding artifact into file
(
echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 0a5d9fba0..bac98a837 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -39,7 +39,7 @@
verify-scenario: 'os-nosdn-nofeature-ha'
scenario_stream: 'gambia'
disable_daily: false
- disable_promote: true
+ disable_promote: false
- fraser: &fraser
branch: 'stable/fraser'
gs-pathname: '/fraser'
@@ -239,18 +239,15 @@
- 'virtual'
os_version:
- - 'pike':
- os_scenario: 'pike'
- odl_branch: 'stable/carbon'
- 'queens':
os_scenario: 'queens'
odl_branch: 'stable/oxygen'
- 'rocky':
os_scenario: 'rocky'
- odl_branch: 'stable/fluorine'
+ odl_branch: 'stable/oxygen'
- 'master':
os_scenario: 'nofeature'
- odl_branch: 'stable/oxygen'
+ odl_branch: 'stable/fluorine'
topology:
- 'noha'
@@ -914,7 +911,7 @@
option: 'project'
triggers:
- - timed: '0 12 * * 0'
+ - '{stream}-{os_version}'
builders:
- multijob:
@@ -2026,3 +2023,78 @@
name: 'apex-danube'
triggers:
- timed: '0 3 1 1 7'
+
+- trigger:
+ name: 'master-master'
+ triggers:
+ - timed: '0 12 * * *'
+
+- trigger:
+ name: 'master-rocky'
+ triggers:
+ - timed: '0 12 * * *'
+
+- trigger:
+ name: 'master-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'gambia-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'gambia-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'gambia-queens'
+ triggers:
+ - timed: '0 12 * * *'
+
+- trigger:
+ name: 'fraser-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'fraser-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'fraser-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'euphrates-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'euphrates-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'euphrates-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'danube-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'danube-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'danube-queens'
+ triggers:
+ - timed: ''
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 33373d665..5a9bcb5e4 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -39,7 +39,7 @@
verify-scenario: 'os-nosdn-nofeature-ha'
scenario_stream: 'gambia'
disable_daily: false
- disable_promote: true
+ disable_promote: false
- fraser: &fraser
branch: 'stable/fraser'
gs-pathname: '/fraser'
@@ -85,18 +85,15 @@
- 'virtual'
os_version:
- - 'pike':
- os_scenario: 'pike'
- odl_branch: 'stable/carbon'
- 'queens':
os_scenario: 'queens'
odl_branch: 'stable/oxygen'
- 'rocky':
os_scenario: 'rocky'
- odl_branch: 'stable/fluorine'
+ odl_branch: 'stable/oxygen'
- 'master':
os_scenario: 'nofeature'
- odl_branch: 'stable/oxygen'
+ odl_branch: 'stable/fluorine'
topology:
- 'noha'
@@ -760,7 +757,7 @@
option: 'project'
triggers:
- - timed: '0 12 * * 0'
+ - '{stream}-{os_version}'
builders:
- multijob:
@@ -1208,3 +1205,78 @@
name: 'apex-danube'
triggers:
- timed: '0 3 1 1 7'
+
+- trigger:
+ name: 'master-master'
+ triggers:
+ - timed: '0 12 * * *'
+
+- trigger:
+ name: 'master-rocky'
+ triggers:
+ - timed: '0 12 * * *'
+
+- trigger:
+ name: 'master-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'gambia-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'gambia-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'gambia-queens'
+ triggers:
+ - timed: '0 12 * * *'
+
+- trigger:
+ name: 'fraser-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'fraser-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'fraser-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'euphrates-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'euphrates-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'euphrates-queens'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'danube-master'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'danube-rocky'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'danube-queens'
+ triggers:
+ - timed: ''
diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index 8afe98695..972848f3d 100644
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -18,7 +18,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - fraser: &fraser
+ - gambia: &gambia
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
diff --git a/jjb/cperf/cperf-ci-jobs.yaml b/jjb/cperf/cperf-ci-jobs.yaml
index efcf51faa..61bdebd34 100644
--- a/jjb/cperf/cperf-ci-jobs.yaml
+++ b/jjb/cperf/cperf-ci-jobs.yaml
@@ -204,17 +204,6 @@
docker ps -a | grep opnfv/cperf | awk '{print $1}' | xargs docker rm -f >${redirect}
fi
- # Remove existing images if exist
- if [[ ! -z $(docker images | grep opnfv/cperf) ]]; then
- echo "Docker images to remove:"
- docker images | head -1 && docker images | grep opnfv/cperf >${redirect}
- image_tags=($(docker images | grep opnfv/cperf | awk '{print $2}'))
- for tag in "${image_tags[@]}"; do
- echo "Removing docker image opnfv/cperf:$tag..."
- docker rmi opnfv/cperf:$tag >/dev/null
- done
- fi
-
- builder:
name: cperf-upload-logs-csit
builders:
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 2e21fb6b7..701d4b471 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -136,7 +136,7 @@ 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}"
+ envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\""
fi
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 12c3397d8..40e62b3bc 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -150,12 +150,14 @@
<<: *other-receivers
- 'pharos-tools-laas-dashboard':
project: 'pharos-tools'
- dockerdir: 'dashboard/web'
+ dockerdir: 'dashboard'
+ dockerfile: 'web/Dockerfile'
<<: *master
<<: *pharos_tools_receivers
- 'pharos-tools-laas-celery':
project: 'pharos-tools'
- dockerdir: 'dashboard/worker'
+ dockerdir: 'dashboard'
+ dockerfile: 'worker/Dockerfile'
<<: *master
<<: *pharos_tools_receivers
- 'qtip':
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index fcd4465cb..6f1ce39a0 100644
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -337,7 +337,9 @@
declare -x "\${var}" 2>/dev/null
echo $var
done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
- ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml
+ ansible-playbook -i playbooks/dynamic_inventory.py \
+ -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
+ playbooks/prepare-tests.yml
ssh root@192.168.122.2 "/root/prepare-tests.sh"
echo "---------------------------------------------------------------------------------"
diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 992194ca3..610268c28 100755
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -49,7 +49,9 @@ export XCI_VENV=${XCI_PATH}/venv
ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; \
while read var; do declare -x \"\${var}\" 2>/dev/null; done < ${XCI_PATH}/.cache/xci.env && \
- cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml"
+ cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py \
+ -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
+ playbooks/prepare-tests.yml"
echo "Prepare OPNFV VM for Tests"
ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/prepare-tests.sh"
echo "Running Functest"
diff --git a/releases/gambia/clover.yaml b/releases/gambia/clover.yaml
new file mode 100644
index 000000000..ee0b786d3
--- /dev/null
+++ b/releases/gambia/clover.yaml
@@ -0,0 +1,9 @@
+---
+project: clover
+project-type: feature
+release-model: stable
+
+branches:
+ - name: stable/gambia
+ location:
+ clover: ee2169ee4b8fb3539ad173fbc1557b54b2f2216f
diff --git a/releases/gambia/stor4nfv.yaml b/releases/gambia/stor4nfv.yaml
new file mode 100644
index 000000000..65c327fe1
--- /dev/null
+++ b/releases/gambia/stor4nfv.yaml
@@ -0,0 +1,9 @@
+---
+project: stor4nfv
+project-type: feature
+release-model: stable
+
+branches:
+ - name: stable/gambia
+ location:
+ stor4nfv: cefd1d0854ee948acc7147834146914983a11556