X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-ng.yaml;h=15dcf767cf2128397ff7e1fa8d94992757787e75;hb=1b32ec1b908c059b78dcfd3118d24dd44944b730;hp=c447d539872ef94c968c343bb6de93b1727ea936;hpb=6c8e1af2e5f78ff2d673175899ed6de56a99d8dd;p=releng.git diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index c447d5398..15dcf767c 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -130,10 +130,10 @@ set +x if [ "_" = "_" ]; then image=alpine:{dependency} - elif [ "_" = "None" ]; then + elif [ "None" = "None" ]; then image=_/alpine:{dependency} else - image=_:/alpine{dependency} + image=_:/alpine:{dependency} fi sudo docker pull $image || true @@ -144,10 +144,10 @@ set +x if [ "_" = "_" ]; then image=alpine:{dependency} - elif [ "_" = "None" ]; then + elif [ "" = "None" ]; then image=_/alpine:{dependency} else - image=_:/alpine{dependency} + image=_:/alpine:{dependency} fi sudo docker rmi $image || true @@ -332,6 +332,7 @@ builders: - shell: | sudo apt-get update && sudo apt-get install curl -y + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then image={container}:{tag}