summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/container4nfv/container4nfv-arm64.yaml2
-rwxr-xr-xjjb/functest/functest-alpine.sh3
-rw-r--r--releases/gambia/barometer.yaml9
-rw-r--r--releases/gambia/sdnvpn.yaml9
4 files changed, 21 insertions, 2 deletions
diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml
index 9ebaea97b..5425ae034 100644
--- a/jjb/container4nfv/container4nfv-arm64.yaml
+++ b/jjb/container4nfv/container4nfv-arm64.yaml
@@ -64,7 +64,7 @@
- project: functest-compass-arm-virtual-daily-master
current-parameters: false
predefined-parameters:
- DEPLOY_SCENARIO={scenario}
+ DEPLOY_SCENARIO='k8-nosdn-nofeature-ha'
same-node: true
block: true
block-thresholds:
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index c82147489..2e21fb6b7 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -135,7 +135,8 @@ 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}'")
- envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
+ IMAGE_PROPERTIES="hw_disk_bus: scsi, hw_scsi_model: virtio-scsi"
+ envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e ${IMAGE_PROPERTIES}"
fi
diff --git a/releases/gambia/barometer.yaml b/releases/gambia/barometer.yaml
new file mode 100644
index 000000000..e5c9842bf
--- /dev/null
+++ b/releases/gambia/barometer.yaml
@@ -0,0 +1,9 @@
+---
+project: barometer
+project-type: feature
+release-model: stable
+
+branches:
+ - name: stable/gambia
+ location:
+ barometer: 9ac248a08de1f197bafbabbf43175b30ab19ec32
diff --git a/releases/gambia/sdnvpn.yaml b/releases/gambia/sdnvpn.yaml
new file mode 100644
index 000000000..c3ee8cad3
--- /dev/null
+++ b/releases/gambia/sdnvpn.yaml
@@ -0,0 +1,9 @@
+---
+project: sdnvpn
+project-type: feature
+release-model: stable
+
+branches:
+ - name: stable/gambia
+ location:
+ sdnvpn: c05105a4f9f51f7bb31cad791e65d664e5a3bc4b