diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2022-09-30 13:01:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2022-09-30 13:01:11 +0000 |
| commit | a7c73e8b1718fca8d36e1afd263268094b887760 (patch) | |
| tree | eff7e99a639d93f58c1d50f582a05cf9652c4dcd | |
| parent | b56474a4e5e5c60eb318d9605c6042158535ef8d (diff) | |
| parent | 443aadfb13bc16a1a09dcb87d72111fb0b190f14 (diff) | |
Merge "Complete Alpine 3.15 update"
| -rw-r--r-- | ansible/site.gate.yml | 2 | ||||
| -rw-r--r-- | build.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml index 35593ed0..f54f586e 100644 --- a/ansible/site.gate.yml +++ b/ansible/site.gate.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: alpine - tag: 3.14 + tag: 3.15 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -32,11 +32,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - alpine:3.14 || true) + alpine:3.15 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm64v8/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -56,11 +56,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/alpine:3.14 || true) + arm64v8/alpine:3.15 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.14|arm32v7/alpine:3.14|g" {} + + -e "s|alpine:3.15|arm32v7/alpine:3.15|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm-latest|g" {} + @@ -80,7 +80,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ - arm32v7/alpine:3.14 || true) + arm32v7/alpine:3.15 || true) find . -name Dockerfile -exec git checkout {} + exit $? |