X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest.yaml;h=2ae099529d3178aba625790f1ddabefecce0edf5;hb=fa58f229c41de75e3fd1b44a9a383c5ed539d456;hp=fa416c9e7eb6c8125e00a2bae55a148d37502a5f;hpb=2ad3aefc27a60b40acfbcbd248a208bcc58422fe;p=releng.git diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index fa416c9e7..2ae099529 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -12,35 +12,40 @@ port: tag: - latest: + from: + buildargs: branch: master - slave: lf-virtual9 - DASHBOARD_URL: http://172.30.13.94 + slave: lf-pod4-2 + DASHBOARD_URL: http://172.30.12.85 + dependency: 3.13 + - wallaby: + from: + buildargs: + branch: stable/wallaby + slave: lf-virtual6 + DASHBOARD_URL: http://172.30.13.91 dependency: 3.13 - leguer: + from: + buildargs: branch: stable/leguer slave: lf-virtual9 DASHBOARD_URL: http://172.30.13.94 dependency: 3.12 - kali: + from: + buildargs: branch: stable/kali slave: lf-pod4-3 DASHBOARD_URL: http://172.30.12.88 dependency: 3.11 - jerma: + from: + buildargs: branch: stable/jerma slave: lf-pod4 DASHBOARD_URL: http://172.30.12.83 dependency: 3.10 - - iruya: - branch: stable/iruya - slave: lf-virtual4 - DASHBOARD_URL: http://172.30.13.89 - dependency: 3.9 - - hunter: - branch: stable/hunter - slave: lf-virtual6 - DASHBOARD_URL: http://172.30.13.91 - dependency: 3.9 - functest-jobs: &functest-jobs name: 'functest-jobs' @@ -323,6 +328,10 @@ - {'tag': 'latest', 'test': 'networking-bgpvpn'} - {'tag': 'latest', 'test': 'networking-sfc'} - {'tag': 'latest', 'test': 'patrole'} + - {'tag': 'wallaby', 'test': 'refstack_defcore'} + - {'tag': 'wallaby', 'test': 'networking-bgpvpn'} + - {'tag': 'wallaby', 'test': 'networking-sfc'} + - {'tag': 'wallaby', 'test': 'patrole'} - {'tag': 'leguer', 'test': 'refstack_defcore'} - {'tag': 'leguer', 'test': 'networking-bgpvpn'} - {'tag': 'leguer', 'test': 'networking-sfc'} @@ -340,20 +349,6 @@ - {'tag': 'jerma', 'test': 'patrole_member'} - {'tag': 'jerma', 'test': 'patrole_reader'} - {'tag': 'jerma', 'test': 'tempest_cyborg'} - - {'tag': 'iruya', 'test': 'refstack_defcore'} - - {'tag': 'iruya', 'test': 'patrole_admin'} - - {'tag': 'iruya', 'test': 'patrole_member'} - - {'tag': 'iruya', 'test': 'patrole_reader'} - - {'tag': 'iruya', 'test': 'tempest_cyborg'} - - {'tag': 'hunter', 'test': 'refstack_compute'} - - {'tag': 'hunter', 'test': 'refstack_object'} - - {'tag': 'hunter', 'test': 'refstack_platform'} - - {'tag': 'hunter', 'test': 'tempest_octavia'} - - {'tag': 'hunter', 'test': 'tempest_telemetry'} - - {'tag': 'hunter', 'test': 'patrole_admin'} - - {'tag': 'hunter', 'test': 'patrole_member'} - - {'tag': 'hunter', 'test': 'patrole_reader'} - - {'tag': 'hunter', 'test': 'tempest_cyborg'} jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -678,6 +673,8 @@ <<: *functest-containers ref_arg: '{ref_arg}' path: '{path}' + buildargs: '{buildargs}' + from: '{from}' - builder: name: functest-build-containers @@ -691,13 +688,18 @@ else image={repo}:{port}/{container}:{tag} fi - if [ "{ref_arg}" = "None" ]; then - build_arg="" - else - build_arg="--build-arg {ref_arg}={ref}" + build_args="" + if [ "{buildargs}" != "None" ]; then + build_args="{buildargs}" + fi + if [ "{ref_arg}" != "None" ]; then + build_args="$build_args --build-arg {ref_arg}={ref}" fi cd {path} - sudo docker build $build_arg \ + if [ "{from}" != "None" ]; then + sed -i {from} Dockerfile + fi + sudo docker build $build_args \ --pull=false --no-cache --force-rm=true \ -t $image . @@ -724,10 +726,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 @@ -738,10 +740,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 @@ -780,13 +782,15 @@ builders: - shell: | set +x - sudo apt-get update && sudo apt-get install software-properties-common gpg -y + sudo apt-get update && sudo apt-get install \ + software-properties-common gpg -y 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 apt-get install 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 + tox - job-template: @@ -809,6 +813,20 @@ jobs: - 'functest-{tag}-tox' +- job-template: + name: 'functest-{repo}-{container}-{tag}-gate' + parameters: + - functest-slave: + slave: '{slave}' + scm: + - functest-scm: + ref: $GERRIT_REFSPEC + builders: + - functest-build-containers: + <<: *functest-build-containers + ref: $GERRIT_REFSPEC + buildargs: '{buildargs}' + - project: name: functest-opnfv-functest-core-{tag}-gate <<: *functest-params @@ -826,6 +844,7 @@ path: docker/tempest exclude: - {'tag': 'latest'} + - {'tag': 'wallaby'} - {'tag': 'leguer'} - {'tag': 'kali'} - {'tag': 'jerma'} @@ -887,19 +906,6 @@ - 'functest-{repo}-{container}-{tag}-gate' -- job-template: - name: 'functest-{repo}-{container}-{tag}-gate' - parameters: - - functest-slave: - slave: '{slave}' - scm: - - functest-scm: - ref: $GERRIT_REFSPEC - builders: - - functest-build-containers: - <<: *functest-build-containers - ref: $GERRIT_REFSPEC - - trigger: name: functest-patchset-created triggers: @@ -1183,6 +1189,7 @@ - functest-build-containers: <<: *functest-build-containers ref: '{branch}' + buildargs: '{buildargs}' - functest-push-containers: <<: *functest-build-containers ref: '{branch}' @@ -1204,6 +1211,7 @@ path: docker/tempest exclude: - {'tag': 'latest'} + - {'tag': 'wallaby'} - {'tag': 'leguer'} - {'tag': 'kali'} - {'tag': 'jerma'} @@ -1327,6 +1335,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} @@ -1348,40 +1357,59 @@ - functest-trivy: <<: *functest-containers +- project: + name: 'functest-opnfv-functest-core-trivy' + <<: *functest-params + container: 'functest-core' + jobs: + - 'functest-{repo}-{container}-{tag}-trivy' + +- project: + name: 'functest-opnfv-functest-tempest-trivy' + <<: *functest-params + container: 'functest-tempest' + jobs: + - 'functest-{repo}-{container}-{tag}-trivy' + - project: name: 'functest-opnfv-functest-healthcheck-trivy' <<: *functest-params container: 'functest-healthcheck' jobs: - 'functest-{repo}-{container}-{tag}-trivy' + - project: name: 'functest-opnfv-functest-smoke-trivy' <<: *functest-params container: 'functest-smoke' jobs: - 'functest-{repo}-{container}-{tag}-trivy' + - project: - name: 'functest-opnfv-functest-smoke-cntt-trivy' + name: 'functest-opnfv-functest-benchmarking-trivy' <<: *functest-params - container: 'functest-smoke-cntt' + container: 'functest-benchmarking' jobs: - 'functest-{repo}-{container}-{tag}-trivy' + - project: - name: 'functest-opnfv-functest-benchmarking-trivy' + name: 'functest-opnfv-functest-vnf-trivy' <<: *functest-params - container: 'functest-benchmarking' + container: 'functest-vnf' jobs: - 'functest-{repo}-{container}-{tag}-trivy' + - project: - name: 'functest-opnfv-functest-benchmarking-cntt-trivy' + name: 'functest-opnfv-functest-smoke-cntt-trivy' <<: *functest-params - container: 'functest-benchmarking-cntt' + container: 'functest-smoke-cntt' jobs: - 'functest-{repo}-{container}-{tag}-trivy' + - project: - name: 'functest-opnfv-functest-vnf-trivy' + name: 'functest-opnfv-functest-benchmarking-cntt-trivy' <<: *functest-params - container: 'functest-vnf' + container: 'functest-benchmarking-cntt' jobs: - 'functest-{repo}-{container}-{tag}-trivy'