Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix DASHBOARD_URL if Xena Gates
[releng.git]
/
jjb
/
functest
/
functest.yaml
diff --git
a/jjb/functest/functest.yaml
b/jjb/functest/functest.yaml
index
0a4dc2a
..
e00ba73
100644
(file)
--- a/
jjb/functest/functest.yaml
+++ b/
jjb/functest/functest.yaml
@@
-13,35
+13,42
@@
tag:
- latest:
from:
tag:
- latest:
from:
- buildargs:
+ build
_
args:
branch: master
slave: lf-pod4-2
DASHBOARD_URL: http://172.30.12.85
branch: master
slave: lf-pod4-2
DASHBOARD_URL: http://172.30.12.85
- dependency: 3.13
+ dependency: 3.14
+ - xena:
+ from:
+ build_args:
+ branch: stable/xena
+ slave: laas-xena
+ DASHBOARD_URL: http://10.200.120.76
+ dependency: 3.14
- wallaby:
from:
- wallaby:
from:
- buildargs:
+ build
_
args:
branch: stable/wallaby
slave: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
dependency: 3.13
- leguer:
from:
branch: stable/wallaby
slave: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
dependency: 3.13
- leguer:
from:
- buildargs:
+ build
_
args:
branch: stable/leguer
slave: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
dependency: 3.12
- kali:
from:
branch: stable/leguer
slave: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
dependency: 3.12
- kali:
from:
- buildargs:
+ build
_
args:
branch: stable/kali
slave: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
dependency: 3.11
- jerma:
from:
branch: stable/kali
slave: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
dependency: 3.11
- jerma:
from:
- buildargs:
+ build
_
args:
branch: stable/jerma
slave: lf-pod4
DASHBOARD_URL: http://172.30.12.83
branch: stable/jerma
slave: lf-pod4
DASHBOARD_URL: http://172.30.12.83
@@
-116,11
+123,13
@@
set +x
volumes=;
if [ "{volumes}" != "None" ]; then
set +x
volumes=;
if [ "{volumes}" != "None" ]; then
- for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+ do volumes="-v $i $volumes"; done
fi
env=;
if [ "{env}" != "None" ]; then
fi
env=;
if [ "{env}" != "None" ]; then
- for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+ for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+ do env="-e $i $env"; done
fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
@@
-372,6
+381,14
@@
test: networking-sfc
- tag: latest
test: patrole
test: networking-sfc
- tag: latest
test: patrole
+ - tag: xena
+ test: refstack_defcore
+ - tag: xena
+ test: networking-bgpvpn
+ - tag: xena
+ test: networking-sfc
+ - tag: xena
+ test: patrole
- tag: wallaby
test: refstack_defcore
- tag: wallaby
- tag: wallaby
test: refstack_defcore
- tag: wallaby
@@
-579,11
+596,13
@@
set +x
volumes=;
if [ "{volumes}" != "None" ]; then
set +x
volumes=;
if [ "{volumes}" != "None" ]; then
- for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+ do volumes="-v $i $volumes"; done
fi
env=;
if [ "{env}" != "None" ]; then
fi
env=;
if [ "{env}" != "None" ]; then
- for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+ for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+ do env="-e $i $env"; done
fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
@@
-849,7
+868,7
@@
<<: *functest-containers
ref_arg: '{ref_arg}'
path: '{path}'
<<: *functest-containers
ref_arg: '{ref_arg}'
path: '{path}'
- build
args: '{build
args}'
+ build
_args: '{build_
args}'
from: '{from}'
- builder:
from: '{from}'
- builder:
@@
-865,8
+884,9
@@
image={repo}:{port}/{container}:{tag}
fi
build_args=""
image={repo}:{port}/{container}:{tag}
fi
build_args=""
- if [ "{buildargs}" != "None" ]; then
- build_args="{buildargs}"
+ if [ "{build_args}" != "None" ]; then
+ for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+ do build_args="--build-arg $i $build_args"; done
fi
if [ "{ref_arg}" != "None" ]; then
build_args="$build_args --build-arg {ref_arg}={ref}"
fi
if [ "{ref_arg}" != "None" ]; then
build_args="$build_args --build-arg {ref_arg}={ref}"
@@
-958,11
+978,15
@@
builders:
- shell: |
set +x
builders:
- shell: |
set +x
- sudo apt-get update && sudo apt-get install \
- software-properties-common gpg -y
+ sudo apt-get update && \
+ sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+ sudo DEBIAN_FRONTEND=noninteractive \
+ apt-get install software-properties-common gpg -y
sudo add-apt-repository -y ppa:deadsnakes/ppa
sudo add-apt-repository -y ppa:deadsnakes/ppa
- sudo apt-get update && sudo apt-get install python3.8 \
- python3.8-dev python3.8-distutils \
+ sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+ apt-get install \
+ python3.9 python3.9-dev python3.9-distutils \
+ python3.8 python3.8-dev python3.8-distutils \
python3.7 python3.7-dev python3.6 python3.6-dev \
python python-dev python3-pip enchant -y
sudo pip3 install tox tox-pip-version
python3.7 python3.7-dev python3.6 python3.6-dev \
python python-dev python3-pip enchant -y
sudo pip3 install tox tox-pip-version
@@
-1001,7
+1025,7
@@
- functest-build-containers:
<<: *functest-build-containers
ref: $GERRIT_REFSPEC
- functest-build-containers:
<<: *functest-build-containers
ref: $GERRIT_REFSPEC
- build
args: '{build
args}'
+ build
_args: '{build_
args}'
- project:
name: functest-opnfv-functest-core-{tag}-gate
- project:
name: functest-opnfv-functest-core-{tag}-gate
@@
-1020,6
+1044,7
@@
path: docker/tempest
exclude:
- {'tag': 'latest'}
path: docker/tempest
exclude:
- {'tag': 'latest'}
+ - {'tag': 'xena'}
- {'tag': 'wallaby'}
- {'tag': 'leguer'}
- {'tag': 'kali'}
- {'tag': 'wallaby'}
- {'tag': 'leguer'}
- {'tag': 'kali'}
@@
-1366,7
+1391,7
@@
- functest-build-containers:
<<: *functest-build-containers
ref: '{branch}'
- functest-build-containers:
<<: *functest-build-containers
ref: '{branch}'
- build
args: '{build
args}'
+ build
_args: '{build_
args}'
- functest-push-containers:
<<: *functest-build-containers
ref: '{branch}'
- functest-push-containers:
<<: *functest-build-containers
ref: '{branch}'
@@
-1388,6
+1413,7
@@
path: docker/tempest
exclude:
- {'tag': 'latest'}
path: docker/tempest
exclude:
- {'tag': 'latest'}
+ - {'tag': 'xena'}
- {'tag': 'wallaby'}
- {'tag': 'leguer'}
- {'tag': 'kali'}
- {'tag': 'wallaby'}
- {'tag': 'leguer'}
- {'tag': 'kali'}
@@
-1512,7
+1538,8
@@
name: functest-trivy
builders:
- shell: |
name: functest-trivy
builders:
- shell: |
- sudo apt-get update && sudo apt-get install curl -y
+ sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+ apt-get install curl -y
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
if [ "{repo}" = "_" ]; then
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
if [ "{repo}" = "_" ]; then