diff options
| -rw-r--r-- | jjb/functest/functest-virtual.yaml | 200 | ||||
| -rw-r--r-- | utils/build-server-ansible/vars/Ubuntu.yml | 1 |
2 files changed, 156 insertions, 45 deletions
diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml index 17341076c..67415290e 100644 --- a/jjb/functest/functest-virtual.yaml +++ b/jjb/functest/functest-virtual.yaml @@ -7,9 +7,16 @@ branch: stable/gambia - hunter: branch: stable/hunter - - master: + - latest: branch: master +- job: + name: alpine-pull + parameters: + - functest-virtual-defaults + builders: + - shell: sudo docker pull alpine:3.8 + - job-template: name: '{repo}-functest-{container}-{tag}-pull' parameters: @@ -21,6 +28,8 @@ name: repo-functest-container-tag-pull <<: *functest-defaultparameters container: + - core + - tempest - healthcheck - smoke - benchmarking @@ -33,6 +42,9 @@ - functest-pulljobs: &functest-pulljobs name: 'functest-pulljobs' projects: + - name: 'alpine-pull' + - name: '{repo}-functest-core-{tag}-pull' + - name: '{repo}-functest-tempest-{tag}-pull' - name: '{repo}-functest-healthcheck-{tag}-pull' - name: '{repo}-functest-smoke-{tag}-pull' - name: '{repo}-functest-benchmarking-{tag}-pull' @@ -40,6 +52,35 @@ - name: '{repo}-functest-vnf-{tag}-pull' - name: '{repo}-functest-features-{tag}-pull' +- job: + name: alpine-rmi + parameters: + - functest-virtual-defaults + builders: + - shell: sudo docker rmi alpine:3.8 || true + +- job-template: + name: '{repo}-functest-{container}-{tag}-rmi' + parameters: + - functest-virtual-defaults + builders: + - shell: sudo docker rmi {repo}/functest-{container}:{tag} || true + +- project: + name: repo-functest-container-tag-rmi + <<: *functest-defaultparameters + container: + - core + - tempest + - healthcheck + - smoke + - benchmarking + - components + - vnf + - features + jobs: + - '{repo}-functest-{container}-{tag}-rmi' + - job-template: name: '{repo}-functest-{container}-{test}-{tag}-run' parameters: @@ -59,7 +100,15 @@ -v /home/opnfv/functest/rally_blacklist.yaml:\ /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\ rally/blacklist.yaml \ - {repo}/functest-{container}:{tag} run_tests -t {test} + {repo}/functest-{container}:{tag} run_tests -t {test} || \ + export RES=$? + gsutil -m cp -r /home/opnfv/functest/results/$JOB_NAME-$BUILD_ID \ + gs://artifacts.opnfv.org/functest/ > /dev/null + find /home/opnfv/functest/results/$JOB_NAME-$BUILD_ID -type f \ + -printf \ + "http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID/%P\n" + sudo rm -rf /home/opnfv/functest/results/$JOB_NAME-$BUILD_ID + exit $RES - project: name: repo-functest-healthcheck-test-tag-run @@ -213,6 +262,46 @@ - name: '{repo}-functest-features-vgpu-{tag}-run' - name: '{repo}-functest-features-stor4nfv_os-{tag}-run' +- functest-advjobs: &functest-advjobs + name: '&functest-advjobs' + projects: + - name: '{repo}-functest-smoke-tempest_smoke-{tag}-run' + - name: '{repo}-functest-smoke-neutron-tempest-plugin-api-{tag}-run' + - name: '{repo}-functest-smoke-rally_sanity-{tag}-run' + - name: '{repo}-functest-smoke-rally_jobs-{tag}-run' + - name: '{repo}-functest-smoke-refstack_defcore-{tag}-run' + - name: '{repo}-functest-smoke-patrole-{tag}-run' + - name: '{repo}-functest-smoke-snaps_smoke-{tag}-run' + - name: '{repo}-functest-smoke-neutron_trunk-{tag}-run' + - name: '{repo}-functest-smoke-networking-bgpvpn-{tag}-run' + - name: '{repo}-functest-smoke-networking-sfc-{tag}-run' + - name: '{repo}-functest-smoke-barbican-{tag}-run' + - name: '{repo}-functest-benchmarking-vmtp-{tag}-run' + - name: '{repo}-functest-benchmarking-shaker-{tag}-run' + - name: '{repo}-functest-components-tempest_full-{tag}-run' + - name: '{repo}-functest-components-tempest_scenario-{tag}-run' + # - name: '{repo}-functest-components-rally_full-{tag}-run' + - name: '{repo}-functest-vnf-cloudify-{tag}-run' + # - name: '{repo}-functest-vnf-cloudify_ims-{tag}-run' + # - name: '{repo}-functest-vnf-heat_ims-{tag}-run' + # - name: '{repo}-functest-vnf-vyos_vrouter-{tag}-run' + # - name: '{repo}-functest-vnf-juju_epc-{tag}-run' + - name: '{repo}-functest-features-doctor-notification-{tag}-run' + - name: '{repo}-functest-features-bgpvpn-{tag}-run' + - name: '{repo}-functest-features-functest-odl-sfc-{tag}-run' + - name: '{repo}-functest-features-barometercollectd-{tag}-run' + - name: '{repo}-functest-features-vgpu-{tag}-run' + - name: '{repo}-functest-features-stor4nfv_os-{tag}-run' + +- functest-advcontainers-rmi: &functest-advcontainers-rmi + name: 'functest-advcontainers-rmi' + projects: + - name: '{repo}-functest-smoke-{tag}-rmi' + - name: '{repo}-functest-benchmarking-{tag}-rmi' + - name: '{repo}-functest-components-{tag}-rmi' + - name: '{repo}-functest-vnf-{tag}-rmi' + - name: '{repo}-functest-features-{tag}-rmi' + - job-template: name: '{repo}-functest-{tag}-daily' <<: *functest-defaultparameters @@ -230,26 +319,29 @@ - functest-virtual-defaults builders: - multijob: - name: pull containers - <<: *functest-pulljobs + name: remove advanced functest containers + <<: *functest-advcontainers-rmi - multijob: - name: healthcheck - <<: *functest-healthcheckjobs + name: remove functest-tempest + projects: + - name: '{repo}-functest-tempest-{tag}-rmi' - multijob: - name: smoke - <<: *functest-smokejobs + name: remove functest-core + projects: + - name: '{repo}-functest-core-{tag}-rmi' - multijob: - name: benchmarking - <<: *functest-benchmarkingjobs + name: remove alpine + projects: + - name: 'alpine-rmi' - multijob: - name: components - <<: *functest-componentsjobs + name: pull containers + <<: *functest-pulljobs - multijob: - name: vnf - <<: *functest-vnfjobs + name: healthcheck + <<: *functest-healthcheckjobs - multijob: - name: features - <<: *functest-featuresjobs + name: advanced suites + <<: *functest-advjobs - project: name: repo-functest-tag-daily @@ -360,6 +452,28 @@ - '{repo}-functest-.*-.*' builders: - multijob: + name: remove advanced functest containers + <<: *functest-advcontainers-rmi + - multijob: + name: remove functest-tempest + projects: + - name: '{repo}-functest-tempest-{tag}-rmi' + <<: *functest-projectparameters + - multijob: + name: remove functest-core + projects: + - name: '{repo}-functest-core-{tag}-rmi' + <<: *functest-projectparameters + - multijob: + name: remove alpine + projects: + - name: 'alpine-rmi' + <<: *functest-projectparameters + - multijob: + name: pull alpine + projects: + - name: 'alpine-pull' + - multijob: name: build functest-core projects: - name: '{repo}-functest-core-{tag}-gate' @@ -388,20 +502,8 @@ name: healthcheck <<: *functest-healthcheckjobs - multijob: - name: smoke - <<: *functest-smokejobs - - multijob: - name: benchmarking - <<: *functest-benchmarkingjobs - - multijob: - name: components - <<: *functest-componentsjobs - # - multijob: - # name: vnf - # <<: *functest-vnfjobs - - multijob: - name: features - <<: *functest-featuresjobs + name: advanced suites + <<: *functest-advjobs - job-template: name: '{repo}-functest-{tag}-check' @@ -416,6 +518,28 @@ - '{repo}-functest-.*-.*' builders: - multijob: + name: remove advanced functest containers + <<: *functest-advcontainers-rmi + - multijob: + name: remove functest-tempest + projects: + - name: '{repo}-functest-tempest-{tag}-rmi' + <<: *functest-projectparameters + - multijob: + name: remove functest-core + projects: + - name: '{repo}-functest-core-{tag}-rmi' + <<: *functest-projectparameters + - multijob: + name: remove alpine + projects: + - name: 'alpine-rmi' + <<: *functest-projectparameters + - multijob: + name: pull alpine + projects: + - name: 'alpine-pull' + - multijob: name: build functest-core projects: - name: '{repo}-functest-core-{tag}-check' @@ -444,20 +568,8 @@ name: healthcheck <<: *functest-healthcheckjobs - multijob: - name: smoke - <<: *functest-smokejobs - - multijob: - name: benchmarking - <<: *functest-benchmarkingjobs - - multijob: - name: components - <<: *functest-componentsjobs - # - multijob: - # name: vnf - # <<: *functest-vnfjobs - - multijob: - name: features - <<: *functest-featuresjobs + name: advanced suites + <<: *functest-advjobs - project: name: repo-functest-tag-build diff --git a/utils/build-server-ansible/vars/Ubuntu.yml b/utils/build-server-ansible/vars/Ubuntu.yml index bd77a4d10..2171460aa 100644 --- a/utils/build-server-ansible/vars/Ubuntu.yml +++ b/utils/build-server-ansible/vars/Ubuntu.yml @@ -129,7 +129,6 @@ - default-jdk - protobuf-c-compiler - openvswitch-switch - - mcelog - name: Add Docker apt key. apt_key: |