diff options
| -rw-r--r-- | jjb/functest/functest-kubernetes-ng.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 20 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 20 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 20 |
4 files changed, 31 insertions, 31 deletions
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index 7876431ff..ea3bb54d1 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -64,7 +64,7 @@ fi build_args="" if [ "{build_args}" != "None" ]; then - for i in $(eval echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \ + 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 diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index e11042f9b..a876cf9b5 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -13,31 +13,31 @@ tag: - latest: from: - buildargs: + build_args: branch: master slave: lf-virtual1-8 dependency: 3.14 - v1.22: from: - buildargs: + build_args: branch: stable/v1.22 slave: lf-virtual1-7 dependency: 3.14 - v1.21: from: - buildargs: + build_args: branch: stable/v1.21 slave: lf-virtual1-6 dependency: 3.13 - leguer: from: - buildargs: + build_args: branch: stable/leguer slave: lf-virtual1-5 dependency: 3.12 - kali: from: - buildargs: + build_args: branch: stable/kali slave: lf-virtual1-4 dependency: 3.11 @@ -631,7 +631,7 @@ <<: *functest-kubernetes-containers ref_arg: '{ref_arg}' path: '{path}' - buildargs: '{buildargs}' + build_args: '{build_args}' from: '{from}' - builder: @@ -647,8 +647,8 @@ image={repo}:{port}/{container}:{tag} fi build_args="" - if [ "{buildargs}" != "None" ]; then - for i in $(eval echo {buildargs} | tr -d '[]' |sed "s/, / /g" ); \ + 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 @@ -786,7 +786,7 @@ - functest-kubernetes-build-containers: <<: *functest-kubernetes-build-containers ref: $GERRIT_REFSPEC - buildargs: '{buildargs}' + build_args: '{build_args}' - project: name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate @@ -1061,7 +1061,7 @@ - functest-kubernetes-build-containers: <<: *functest-kubernetes-build-containers ref: '{branch}' - buildargs: '{buildargs}' + build_args: '{build_args}' - functest-kubernetes-push-containers: <<: *functest-kubernetes-build-containers ref: '{branch}' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 7a0be506a..fd658c5b2 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -13,35 +13,35 @@ tag: - latest: from: - buildargs: + build_args: branch: master slave: lf-pod4-2 DASHBOARD_URL: http://172.30.12.85 dependency: 3.14 - wallaby: from: - buildargs: + build_args: 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: - buildargs: + build_args: 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 @@ -853,7 +853,7 @@ <<: *functest-containers ref_arg: '{ref_arg}' path: '{path}' - buildargs: '{buildargs}' + build_args: '{build_args}' from: '{from}' - builder: @@ -869,8 +869,8 @@ image={repo}:{port}/{container}:{tag} fi build_args="" - if [ "{buildargs}" != "None" ]; then - for i in $(eval echo {buildargs} | tr -d '[]' |sed "s/, / /g" ); \ + 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 @@ -1008,7 +1008,7 @@ - functest-build-containers: <<: *functest-build-containers ref: $GERRIT_REFSPEC - buildargs: '{buildargs}' + build_args: '{build_args}' - project: name: functest-opnfv-functest-core-{tag}-gate @@ -1373,7 +1373,7 @@ - functest-build-containers: <<: *functest-build-containers ref: '{branch}' - buildargs: '{buildargs}' + build_args: '{build_args}' - functest-push-containers: <<: *functest-build-containers ref: '{branch}' diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 1b22fdc91..448a8310a 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -13,31 +13,31 @@ tag: - latest: from: - buildargs: + build_args: branch: master slave: lf-virtual1 dependency: 3.14 - wallaby: from: - buildargs: + build_args: branch: stable/wallaby slave: lf-virtual1 dependency: 3.13 - leguer: from: - buildargs: + build_args: branch: stable/leguer slave: lf-virtual1 dependency: 3.12 - kali: from: - buildargs: + build_args: branch: stable/kali slave: lf-virtual1 dependency: 3.11 - jerma: from: - buildargs: + build_args: branch: stable/jerma slave: lf-virtual1 dependency: 3.10 @@ -384,7 +384,7 @@ <<: *xtesting-containers ref_arg: '{ref_arg}' path: '{path}' - buildargs: '{buildargs}' + build_args: '{build_args}' from: '{from}' - builder: @@ -400,8 +400,8 @@ image={repo}:{port}/{container}:{tag} fi build_args="" - if [ "{buildargs}" != "None" ]; then - for i in $(eval echo {buildargs} | tr -d '[]' |sed "s/, / /g" ); \ + 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 @@ -539,7 +539,7 @@ - xtesting-build-containers: <<: *xtesting-build-containers ref: $GERRIT_REFSPEC - buildargs: '{buildargs}' + build_args: '{build_args}' - project: name: xtesting-opnfv-xtesting-{tag}-gate @@ -708,7 +708,7 @@ - xtesting-build-containers: <<: *xtesting-build-containers ref: '{branch}' - buildargs: '{buildargs}' + build_args: '{build_args}' - xtesting-push-containers: <<: *xtesting-build-containers ref: '{branch}' |