X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fairship.yaml;h=49ea4fa92a34438930ecbd9378adfecf5130bc4d;hb=ba48a39d65c472deff98d6b0df4c3e92e4b28870;hp=dc10d0a9a24d79ee036279740d732c7e6aad4141;hpb=04594c212a266bfc4702daef8272b4b8d8fb3973;p=releng.git diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml index dc10d0a9a..49ea4fa92 100644 --- a/jjb/airship/airship.yaml +++ b/jjb/airship/airship.yaml @@ -8,9 +8,10 @@ repo: 'opnfv' port: tag: - - hunter: - branch: stable/hunter + - latest: + branch: master slave: intel-pod17 + functest_tag: hunter - parameter: name: airship-slave @@ -19,19 +20,12 @@ name: slave default: '{slave}' -- parameter: - name: airship-branch - parameters: - - string: - name: branch - default: '{branch}' - - airship-containers: &airship-containers name: 'airship-containers' repo: '{repo}' port: '{port}' container: '{container}' - tag: '{tag}' + functest_tag: '{functest_tag}' - airship-run-containers: &airship-run-containers name: 'airship-run-containers' @@ -44,28 +38,31 @@ - shell: | set +x if [ "{repo}" = "_" ]; then - image={container}:{tag} + image={container}:{functest_tag} elif [ "{port}" = "None" ]; then - image={repo}/{container}:{tag} + image={repo}/{container}:{functest_tag} else - image={repo}:{port}/{container}:{tag} + image={repo}:{port}/{container}:{functest_tag} fi - docker pull $image + sudo docker pull $image - builder: name: airship-run-containers builders: - shell: | set +ex - [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then - image={container}:{tag} + image={container}:{functest_tag} elif [ "{port}" = "None" ]; then - image={repo}/{container}:{tag} + image={repo}/{container}:{functest_tag} else - image={repo}:{port}/{container}:{tag} + image={repo}:{port}/{container}:{functest_tag} fi - docker run --rm \ + sudo docker run --rm \ + -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ + -e NODE_NAME=intel-pod17 \ + -e INSTALLER_TYPE=airship \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ @@ -73,7 +70,7 @@ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\ site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \ - $image run_tests -t {test} + $image run_tests -t {test} -r res=$? gsutil -m cp -r $WORKSPACE/ \ gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 @@ -88,14 +85,68 @@ - shell: | set +x if [ "{repo}" = "_" ]; then - image={container}:{tag} + image={container}:{functest_tag} elif [ "{port}" = "None" ]; then - image={repo}/{container}:{tag} + image={repo}/{container}:{functest_tag} else - image={repo}:{port}/{container}:{tag} + image={repo}:{port}/{container}:{functest_tag} fi - docker rmi $image || true + sudo docker rmi $image || true +- builder: + name: airship-deploy + builders: + - shell: | + set +x + export TERM_OPTS=" " + sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site' + +- scm: + name: airship-scm + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/airship + refspec: '+refs/changes/*:refs/changes/*' + branches: + - '{ref}' + +- parameter: + name: airship-branch + parameters: + - string: + name: branch + default: '{branch}' + +- job-template: + name: 'airship-deploy-daily-{tag}' + parameters: + - airship-slave: + slave: '{slave}' + - airship-branch: + branch: '{branch}' + scm: + - airship-scm: + ref: $branch + builders: + - airship-deploy + +- job-template: + name: 'airship-deploy-gate-{tag}' + parameters: + - airship-slave: + slave: '{slave}' + scm: + - airship-scm: + ref: $GERRIT_REFSPEC + builders: + - airship-deploy + +- project: + name: 'airship-deploy' + <<: *airship-params + jobs: + - 'airship-deploy-daily-{tag}' + - 'airship-deploy-gate-{tag}' - job-template: name: 'airship-{repo}-{container}-{tag}-pull' @@ -134,13 +185,6 @@ jobs: - 'airship-{repo}-{container}-{tag}-pull' -- project: - name: 'airship-opnfv-functest-features-pull' - <<: *airship-params - container: 'functest-features' - jobs: - - 'airship-{repo}-{container}-{tag}-pull' - - job-template: name: 'airship-{repo}-{container}-{tag}-rmi' parameters: @@ -178,13 +222,6 @@ jobs: - 'airship-{repo}-{container}-{tag}-rmi' -- project: - name: 'airship-opnfv-functest-features-rmi' - <<: *airship-params - container: 'functest-features' - jobs: - - 'airship-{repo}-{container}-{tag}-rmi' - - job-template: name: 'airship-{repo}-{container}-{tag}-{test}-run' parameters: @@ -257,19 +294,6 @@ jobs: - 'airship-{repo}-{container}-{tag}-{test}-run' -- project: - name: 'airship-opnfv-functest-features' - <<: *airship-params - container: 'functest-features' - test: - - doctor-notification - - functest-odl-sfc - - barometercollectd - - vgpu - - stor4nfv_os - jobs: - - 'airship-{repo}-{container}-{tag}-{test}-run' - - job-template: name: 'airship-{tag}-daily' project-type: multijob @@ -278,13 +302,20 @@ parameters: - airship-slave: slave: '{slave}' + - airship-branch: + branch: 'master' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^airship-{tag}-(daily|check|gate)$' + - '^airship-{tag}-(daily|gate)$' builders: + - multijob: + name: deploy + projects: + - name: 'airship-deploy-daily-latest' + <<: *airship-jobs - multijob: name: remove former images projects: @@ -296,8 +327,6 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-vnf-{tag}-rmi' <<: *airship-jobs - - name: 'airship-opnfv-functest-features-{tag}-rmi' - <<: *airship-jobs - multijob: name: pull containers projects: @@ -309,10 +338,9 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-vnf-{tag}-pull' <<: *airship-jobs - - name: 'airship-opnfv-functest-features-{tag}-pull' - <<: *airship-jobs - multijob: - name: opnfv/functest-healthcheck:{tag} + name: opnfv/functest-healthcheck:{functest_tag} + condition: ALWAYS projects: - name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *airship-jobs @@ -339,7 +367,8 @@ - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *airship-jobs - multijob: - name: opnfv/functest-smoke:{tag} + name: opnfv/functest-smoke:{functest_tag} + condition: ALWAYS projects: - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *airship-jobs @@ -362,7 +391,8 @@ - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run' <<: *airship-jobs - multijob: - name: opnfv/functest-benchmarking:{tag} + name: opnfv/functest-benchmarking:{functest_tag} + condition: ALWAYS projects: - name: 'airship-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *airship-jobs @@ -373,7 +403,8 @@ - name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run' <<: *airship-jobs - multijob: - name: opnfv/functest-vnf:{tag} + name: opnfv/functest-vnf:{functest_tag} + condition: ALWAYS execution-type: SEQUENTIALLY projects: - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run' @@ -386,26 +417,140 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *airship-jobs + +- trigger: + name: airship-patchset-created + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: 'airship' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + +- job-template: + name: 'airship-{tag}-gate' + project-type: multijob + triggers: + - airship-patchset-created: + branch: '{branch}' + parameters: + - airship-slave: + slave: '{slave}' + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^airship-{tag}-(daily|gate)$' + builders: + - multijob: + name: deploy + projects: + - name: 'airship-deploy-gate-latest' + <<: *airship-jobs - multijob: - name: opnfv/functest-features:{tag} + name: remove former images projects: - - name: 'airship-opnfv-functest-features-{tag}-doctor-notification-run' + - name: 'airship-opnfv-functest-healthcheck-{tag}-rmi' <<: *airship-jobs - - name: 'airship-opnfv-functest-features-{tag}-functest-odl-sfc-run' + - name: 'airship-opnfv-functest-smoke-{tag}-rmi' <<: *airship-jobs - - name: 'airship-opnfv-functest-features-{tag}-barometercollectd-run' + - name: 'airship-opnfv-functest-benchmarking-{tag}-rmi' <<: *airship-jobs - - name: 'airship-opnfv-functest-features-{tag}-vgpu-run' + - name: 'airship-opnfv-functest-vnf-{tag}-rmi' <<: *airship-jobs - - name: 'airship-opnfv-functest-features-{tag}-stor4nfv_os-run' + - multijob: + name: pull containers + projects: + - name: 'airship-opnfv-functest-healthcheck-{tag}-pull' + <<: *airship-jobs + - name: 'airship-opnfv-functest-smoke-{tag}-pull' + <<: *airship-jobs + - name: 'airship-opnfv-functest-benchmarking-{tag}-pull' + <<: *airship-jobs + - name: 'airship-opnfv-functest-vnf-{tag}-pull' + <<: *airship-jobs + - multijob: + name: opnfv/functest-healthcheck:{functest_tag} + projects: + - name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-vmready1-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-vmready2-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-singlevm1-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-singlevm2-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-vping_ssh-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-vping_userdata-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-cinder_test-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-odl-run' + <<: *airship-jobs + - multijob: + name: opnfv/functest-smoke:{functest_tag} + projects: + - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run' + <<: *airship-jobs + - multijob: + name: opnfv/functest-benchmarking:{functest_tag} + projects: + - name: 'airship-opnfv-functest-benchmarking-{tag}-vmtp-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run' + <<: *airship-jobs + - multijob: + name: opnfv/functest-vnf:{functest_tag} + condition: ALWAYS + execution-type: SEQUENTIALLY + projects: + - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-vnf-{tag}-cloudify_ims-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-vnf-{tag}-heat_ims-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-vnf-{tag}-vyos_vrouter-run' + <<: *airship-jobs + - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *airship-jobs - - project: name: 'airship' <<: *airship-params jobs: - 'airship-{tag}-daily' + - 'airship-{tag}-gate' - view: name: airship