Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Set cinder service type in rally tests
[functest.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
8610330
..
8fe06d9
100644
(file)
--- a/
build.sh
+++ b/
build.sh
@@
-8,13
+8,11
@@
docker/core \
docker/tempest \
docker/healthcheck \
docker/smoke \
docker/tempest \
docker/healthcheck \
docker/smoke \
+docker/benchmarking \
docker/features \
docker/features \
-docker/components \
docker/vnf"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
docker/vnf"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
-build_opts=(--pull=true --no-cache --force-rm=true \
- --build-arg OPENSTACK_TAG="${OPENSTACK_TAG:-stable/queens}" \
- --build-arg RALLY_OPENSTACK_TAG="${RALLY_OPENSTACK_TAG:-1.2.0}")
+build_opts=(--pull=true --no-cache --force-rm=true)
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
@@
-29,11
+27,11
@@
for dir in ${amd64_dirs}; do
(docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
done
[ ! -z "${amd64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.
7
|| true)
+ (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.
9
|| true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|alpine:3.
7|multiarch/alpine:arm64-v3.7
|g" {} +
+ -e "s|alpine:3.
9|multiarch/alpine:arm64-v3.9
|g" {} +
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
find . -name Dockerfile -exec sed -i \
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
find . -name Dockerfile -exec sed -i \
@@
-47,7
+45,7
@@
for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-core:arm64-latest" \
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-core:arm64-latest" \
- multiarch/alpine:arm64-v3.
7
|| true)
+ multiarch/alpine:arm64-v3.
9
|| true)
find . -name Dockerfile -exec git checkout {} +
exit $?
find . -name Dockerfile -exec git checkout {} +
exit $?