diff options
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 1 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes-docker.yaml | 6 | ||||
| -rw-r--r-- | jjb/functest/functest.ovn.yaml | 1096 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 2 | ||||
| -rw-r--r-- | jjb/functest/xtesting-docker.yaml | 6 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 10 | ||||
| -rw-r--r-- | jjb/releng/opnfv-repo-archiver.sh | 68 | ||||
| -rw-r--r-- | jjb/releng/opnfv-utils.yaml | 38 |
10 files changed, 1116 insertions, 121 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 5a63d093e..c1bab197a 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -50,6 +50,7 @@ - itri-pod1: slave-label: itri-pod1 <<: *master + disabled: true # ------------------------------- # scenarios # ------------------------------- diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 3cdff3d16..018abed85 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -76,11 +76,11 @@ <<: *iruya # fuel NONE CI PODs - zte-pod1: - slave-label: fuel-baremetal + slave-label: zte-pod1 installer: fuel <<: *master - itri-pod1: - slave-label: fuel-baremetal + slave-label: itri-pod1 installer: fuel <<: *master diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index c11b4e13d..69c994d36 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -24,7 +24,7 @@ arch_tag: - 'amd64': - slave_label: 'opnfv-build-ubuntu' + slave_label: 'lf-build2' - 'arm64': slave_label: 'opnfv-build-ubuntu-arm' @@ -94,7 +94,7 @@ - functest-job-parameters: project: '{project}' branch: '{branch}' - slave_label: 'opnfv-build-ubuntu' + slave_label: 'lf-build2' arch_tag: 'amd64' properties: @@ -238,7 +238,7 @@ branch: '{branch}' - label: name: SLAVE_LABEL - default: 'opnfv-build-ubuntu' + default: 'lf-build2' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index 8ae350a08..21fbdb4ec 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -24,7 +24,7 @@ arch_tag: - 'amd64': - slave_label: 'opnfv-build-ubuntu' + slave_label: 'lf-build2' - 'arm64': slave_label: 'opnfv-build-ubuntu-arm' @@ -76,7 +76,7 @@ - functest-kubernetes-job-parameters: project: '{project}' branch: '{branch}' - slave_label: 'opnfv-build-ubuntu' + slave_label: 'lf-build2' arch_tag: 'amd64' properties: @@ -174,7 +174,7 @@ branch: '{branch}' - label: name: SLAVE_LABEL - default: 'opnfv-build-ubuntu' + default: 'lf-build2' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml new file mode 100644 index 000000000..b3ae260df --- /dev/null +++ b/jjb/functest/functest.ovn.yaml @@ -0,0 +1,1096 @@ +--- +- functest-ovn-jobs: &functest-ovn-jobs + name: 'functest-ovn-jobs' + current-parameters: true + +- functest-ovn-params: &functest-ovn-params + name: 'functest-ovn-params' + repo: 'opnfv' + port: + tag: + - jerma: + branch: stable/jerma + slave: lf-pod4-2 + dashboard_url: http://172.30.12.85 + +- parameter: + name: functest-ovn-slave + parameters: + - label: + name: slave + default: '{slave}' + +- parameter: + name: functest-ovn-build_tag + parameters: + - random-string: + name: build_tag + +- parameter: + name: functest-ovn-branch + parameters: + - string: + name: branch + default: '{branch}' + +- parameter: + name: functest-ovn-DEBUG + parameters: + - string: + name: DEBUG + default: 'true' + +- parameter: + name: functest-ovn-EXTERNAL_NETWORK + parameters: + - string: + name: EXTERNAL_NETWORK + default: public + +- functest-ovn-containers: &functest-ovn-containers + name: 'functest-ovn-containers' + repo: '{repo}' + port: '{port}' + container: '{container}' + tag: '{tag}' + +- functest-ovn-run-containers: &functest-ovn-run-containers + name: 'functest-ovn-run-containers' + <<: *functest-ovn-containers + test: '{test}' + dashboard_url: '{dashboard_url}' + +- functest-ovn-build-containers: &functest-ovn-build-containers + name: 'functest-ovn-build-containers' + <<: *functest-ovn-containers + ref_arg: '{ref_arg}' + path: '{path}' + +- builder: + name: functest-ovn-pull-containers + builders: + - shell: | + set +x + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + sudo docker pull $image + +- builder: + name: functest-ovn-build-containers + builders: + - shell: | + set +x + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + if [ "{ref_arg}" = "None" ]; then + build_arg="" + else + build_arg="--build-arg {ref_arg}={ref}" + fi + cd {path} + sudo docker build $build_arg \ + --pull=false --no-cache --force-rm=true \ + -t $image . + +- builder: + name: functest-ovn-run-containers + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + if [ "{tag}" = "latest" ]; then + py=3.8 + elif [ "{tag}" = "jerma" ]; then + py=3.7 + elif [ "{tag}" = "iruya" ]; then + py=3.6 + else + py=2.7 + fi + sudo docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ + -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ + -e NODE_NAME=$slave \ + -e BUILD_TAG=$BUILD_TAG \ + -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=$DEBUG \ + -e DEPLOY_SCENARIO=os-ovn-nofeature-noha \ + -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ + -e DASHBOARD_URL={dashboard_url} \ + -e VOLUME_DEVICE_NAME=sdb \ + -e IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi \ + -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ + -v /home/opnfv/functest/images:/home/opnfv/functest/images \ + -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python$py/\ + site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\ + tempest_conf.yaml \ + -v /home/opnfv/functest/.boto:/root/.boto \ + $image run_tests -t {test} -r -p + +- builder: + name: functest-ovn-remove-images + builders: + - shell: | + set +x + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + sudo docker rmi $image || true + +- scm: + name: functest-ovn-scm + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/functest + refspec: '+refs/changes/*:refs/changes/*' + branches: + - '{ref}' + +- job-template: + name: 'functest-ovn-{repo}-{container}-{tag}-pull' + parameters: + - functest-ovn-slave: + slave: '{slave}' + builders: + - functest-ovn-pull-containers: + <<: *functest-ovn-containers + +- project: + name: 'functest-ovn-opnfv-functest-healthcheck-pull' + <<: *functest-ovn-params + container: 'functest-healthcheck' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-pull' + +- project: + name: 'functest-ovn-opnfv-functest-smoke-pull' + <<: *functest-ovn-params + container: 'functest-smoke' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-pull' + +- project: + name: 'functest-ovn-opnfv-functest-smoke-cntt-pull' + <<: *functest-ovn-params + container: 'functest-smoke-cntt' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-pull' + +- project: + name: 'functest-ovn-opnfv-functest-benchmarking-pull' + <<: *functest-ovn-params + container: 'functest-benchmarking' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-pull' + +- project: + name: 'functest-ovn-opnfv-functest-vnf-pull' + <<: *functest-ovn-params + container: 'functest-vnf' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-pull' + +- job-template: + name: 'functest-ovn-{repo}-{container}-{tag}-rmi' + parameters: + - functest-ovn-slave: + slave: '{slave}' + builders: + - functest-ovn-remove-images: + <<: *functest-ovn-containers + +- project: + name: 'functest-ovn-opnfv-functest-healthcheck-rmi' + <<: *functest-ovn-params + container: 'functest-healthcheck' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-rmi' + +- project: + name: 'functest-ovn-opnfv-functest-smoke-rmi' + <<: *functest-ovn-params + container: 'functest-smoke' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-rmi' + +- project: + name: 'functest-ovn-opnfv-functest-smoke-cntt-rmi' + <<: *functest-ovn-params + container: 'functest-smoke-cntt' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-rmi' + +- project: + name: 'functest-ovn-opnfv-functest-benchmarking-rmi' + <<: *functest-ovn-params + container: 'functest-benchmarking' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-rmi' + +- project: + name: 'functest-ovn-opnfv-functest-vnf-rmi' + <<: *functest-ovn-params + container: 'functest-vnf' + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-rmi' + +- job-template: + name: 'functest-ovn-{repo}-{container}-{tag}-{test}-run' + parameters: + - functest-ovn-slave: + slave: '{slave}' + - functest-ovn-build_tag: + build_tag: '' + - functest-ovn-DEBUG: + DEBUG: 'true' + - functest-ovn-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + builders: + - functest-ovn-run-containers: + <<: *functest-ovn-run-containers + +- project: + name: 'functest-ovn-opnfv-functest-healthcheck' + <<: *functest-ovn-params + container: 'functest-healthcheck' + test: + - connection_check + - tenantnetwork1 + - tenantnetwork2 + - vmready1 + - vmready2 + - singlevm1 + - singlevm2 + - vping_ssh + - vping_userdata + - cinder_test + - odl + - tempest_smoke + - tempest_horizon + exclude: + - tag: hunter + test: tempest_horizon + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-{test}-run' + +- project: + name: 'functest-ovn-opnfv-functest-smoke' + <<: *functest-ovn-params + container: 'functest-smoke' + test: + - neutron-tempest-plugin-api + - tempest_cinder + - tempest_keystone + - rally_sanity + - refstack_defcore + - refstack_compute + - refstack_object + - refstack_platform + - tempest_full + - tempest_scenario + - tempest_slow + - patrole + - neutron_trunk + - networking-bgpvpn + - networking-sfc + - barbican + - octavia + exclude: + - tag: latest + test: refstack_defcore + - tag: jerma + test: refstack_defcore + - tag: iruya + test: refstack_defcore + - tag: iruya + test: octavia + - tag: hunter + test: refstack_compute + - tag: hunter + test: refstack_object + - tag: hunter + test: refstack_platform + - tag: hunter + test: octavia + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-{test}-run' + +- project: + name: 'functest-ovn-opnfv-functest-smoke-cntt' + <<: *functest-ovn-params + container: 'functest-smoke-cntt' + test: + - neutron-tempest-plugin-api + - tempest_cinder + - tempest_keystone + - rally_sanity + - tempest_full + - tempest_scenario + - tempest_slow + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-{test}-run' + +- project: + name: 'functest-ovn-opnfv-functest-benchmarking' + <<: *functest-ovn-params + container: 'functest-benchmarking' + test: + - rally_full + - rally_jobs + - vmtp + - shaker + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-{test}-run' + +- project: + name: 'functest-ovn-opnfv-functest-vnf' + <<: *functest-ovn-params + container: 'functest-vnf' + test: + - cloudify + - cloudify_ims + - heat_ims + - vyos_vrouter + - juju_epc + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-{test}-run' + +- builder: + name: functest-ovn-zip + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + sudo docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \ + -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ + -e BUILD_TAG=$BUILD_TAG \ + -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -v /home/opnfv/functest/.boto:/root/.boto \ + $image zip_campaign + +- job-template: + name: 'functest-ovn-{tag}-zip' + parameters: + - functest-ovn-build_tag: + build_tag: '' + builders: + - functest-ovn-zip: + <<: *functest-ovn-containers + +- project: + name: 'functest-ovn-{tag}-zip' + <<: *functest-ovn-params + container: 'functest-healthcheck' + jobs: + - 'functest-ovn-{tag}-zip' + +- job-template: + name: 'functest-ovn-{tag}-daily' + project-type: multijob + triggers: + - timed: '@daily' + parameters: + - functest-ovn-slave: + slave: '{slave}' + - functest-ovn-build_tag: + build_tag: '' + - functest-ovn-DEBUG: + DEBUG: 'true' + - functest-ovn-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^functest-ovn-{tag}-(daily|check|gate)$' + builders: + - multijob: + name: remove former images + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi' + <<: *functest-ovn-jobs + - multijob: + name: pull containers + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-pull' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-pull' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-pull' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-pull' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-pull' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-healthcheck:{tag} + condition: ALWAYS + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_ssh-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_userdata-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-cinder_test-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-odl-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-smoke:{tag} + condition: ALWAYS + projects: + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_compute-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_object-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_platform-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_slow-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-smoke-cntt:{tag} + condition: ALWAYS + projects: + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-benchmarking:{tag} + condition: ALWAYS + projects: + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-vmtp-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-vnf:{tag} + condition: ALWAYS + execution-type: SEQUENTIALLY + projects: + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify_ims-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-heat_ims-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-vyos_vrouter-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-juju_epc-run' + <<: *functest-ovn-jobs + - multijob: + name: dump all campaign data + condition: ALWAYS + projects: + - name: 'functest-ovn-{tag}-zip' + <<: *functest-ovn-jobs + +- job-template: + name: 'functest-ovn-{repo}-{container}-{tag}-gate' + parameters: + - functest-ovn-slave: + slave: '{slave}' + scm: + - functest-ovn-scm: + ref: $GERRIT_REFSPEC + builders: + - functest-ovn-build-containers: + <<: *functest-ovn-build-containers + ref: $GERRIT_REFSPEC + +- job-template: + name: 'functest-ovn-{repo}-{container}-{tag}-check' + parameters: + - functest-ovn-slave: + slave: '{slave}' + - functest-ovn-branch: + branch: '{branch}' + scm: + - functest-ovn-scm: + ref: $branch + builders: + - functest-ovn-build-containers: + <<: *functest-ovn-build-containers + ref: $branch + +- project: + name: 'functest-ovn-_-alpine-3.11-rmi' + repo: _ + port: + container: alpine + tag: '3.11' + slave: master + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-rmi' + +- project: + name: 'functest-ovn-_-alpine-3.11-pull' + repo: _ + port: + container: alpine + tag: '3.11' + slave: master + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-pull' + +- project: + name: functest-ovn-opnfv-functest-ovn-core-{tag}-build + <<: *functest-ovn-params + container: functest-ovn-core + ref_arg: BRANCH + path: docker/core + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + +- project: + name: functest-ovn-opnfv-functest-ovn-tempest-{tag}-build + <<: *functest-ovn-params + container: functest-ovn-tempest + ref_arg: BRANCH + path: docker/tempest + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + exclude: + - tag: latest + - tag: jerma + +- project: + name: functest-ovn-opnfv-functest-healthcheck-{tag}-build + <<: *functest-ovn-params + container: functest-healthcheck + ref_arg: BRANCH + path: docker/healthcheck + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + +- project: + name: functest-ovn-opnfv-functest-smoke-{tag}-build + <<: *functest-ovn-params + container: functest-smoke + ref_arg: BRANCH + path: docker/smoke + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + +- project: + name: functest-ovn-opnfv-functest-benchmarking-{tag}-build + <<: *functest-ovn-params + container: functest-benchmarking + ref_arg: BRANCH + path: docker/benchmarking + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + +- project: + name: functest-ovn-opnfv-functest-vnf-{tag}-build + <<: *functest-ovn-params + container: functest-vnf + ref_arg: + path: docker/vnf + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + +- project: + name: functest-ovn-opnfv-functest-smoke-cntt-{tag}-build + <<: *functest-ovn-params + container: functest-smoke-cntt + ref_arg: BRANCH + path: docker/smoke-cntt + jobs: + - 'functest-ovn-{repo}-{container}-{tag}-gate' + - 'functest-ovn-{repo}-{container}-{tag}-check' + +- job-template: + name: 'functest-ovn-{tag}-check' + project-type: multijob + parameters: + - functest-ovn-slave: + slave: '{slave}' + - functest-ovn-build_tag: + build_tag: '' + - functest-ovn-branch: + branch: '{branch}' + - functest-ovn-DEBUG: + DEBUG: 'true' + - functest-ovn-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^functest-ovn-{tag}-(daily|check|gate)$' + builders: + - multijob: + name: remove former images + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi' + <<: *functest-ovn-jobs + - multijob: + name: remove dependencies + projects: + - name: 'functest-ovn-_-alpine-3.11-rmi' + <<: *functest-ovn-jobs + - multijob: + name: pull dependencies + projects: + - name: 'functest-ovn-_-alpine-3.11-pull' + <<: *functest-ovn-jobs + - multijob: + name: build opnfv/functest-ovn-core + projects: + - name: 'functest-ovn-opnfv-functest-ovn-core-{tag}-check' + <<: *functest-ovn-jobs + - multijob: + name: build opnfv/functest-ovn-tempest + projects: + - name: 'functest-ovn-opnfv-functest-ovn-tempest-{tag}-check' + <<: *functest-ovn-jobs + - multijob: + name: build containers + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-check' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-check' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-check' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-check' + <<: *functest-ovn-jobs + - multijob: + name: build opnfv/functest-smoke-cntt + projects: + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-check' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-healthcheck:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_ssh-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_userdata-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-cinder_test-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-odl-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-smoke:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_compute-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_object-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_platform-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_slow-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-benchmarking:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-vmtp-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-vnf:{tag} + execution-type: SEQUENTIALLY + projects: + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify_ims-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-heat_ims-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-vyos_vrouter-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-juju_epc-run' + <<: *functest-ovn-jobs + +- trigger: + name: functest-ovn-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: 'functest' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false + +- job-template: + name: 'functest-ovn-{tag}-gate' + project-type: multijob + triggers: + - functest-ovn-patchset-created: + branch: '{branch}' + parameters: + - functest-ovn-slave: + slave: '{slave}' + - functest-ovn-build_tag: + build_tag: '' + - functest-ovn-DEBUG: + DEBUG: 'true' + - functest-ovn-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^functest-ovn-{tag}-(daily|check|gate)$' + builders: + - multijob: + name: remove former images + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi' + <<: *functest-ovn-jobs + - multijob: + name: remove dependencies + projects: + - name: 'functest-ovn-_-alpine-3.11-rmi' + <<: *functest-ovn-jobs + - multijob: + name: pull dependencies + projects: + - name: 'functest-ovn-_-alpine-3.11-pull' + <<: *functest-ovn-jobs + - multijob: + name: build opnfv/functest-ovn-core + projects: + - name: 'functest-ovn-opnfv-functest-ovn-core-{tag}-gate' + <<: *functest-ovn-jobs + - multijob: + name: build opnfv/functest-ovn-tempest + projects: + - name: 'functest-ovn-opnfv-functest-ovn-tempest-{tag}-gate' + <<: *functest-ovn-jobs + - multijob: + name: build containers + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-gate' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-gate' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-gate' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-gate' + <<: *functest-ovn-jobs + - multijob: + name: build opnfv/functest-smoke-cntt + projects: + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-gate' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-healthcheck:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-connection_check-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vmready2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm1-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-singlevm2-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_ssh-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-vping_userdata-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-cinder_test-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-odl-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-healthcheck-{tag}-tempest_horizon-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-smoke:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_cinder-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_keystone-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_defcore-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_compute-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_object-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-refstack_platform-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_slow-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-sfc-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-barbican-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-octavia-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-smoke-cntt:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-benchmarking:{tag} + projects: + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_full-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-vmtp-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run' + <<: *functest-ovn-jobs + - multijob: + name: opnfv/functest-vnf:{tag} + execution-type: SEQUENTIALLY + projects: + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify_ims-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-heat_ims-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-vyos_vrouter-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-vnf-{tag}-juju_epc-run' + <<: *functest-ovn-jobs + +- project: + name: 'functest-ovn' + <<: *functest-ovn-params + jobs: + - 'functest-ovn-{tag}-daily' + - 'functest-ovn-{tag}-check' + - 'functest-ovn-{tag}-gate' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index b93be3a4e..663db8c81 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -1110,4 +1110,4 @@ - last-success - last-failure - last-duration - regex: ^functest-[a-z]+-(daily|check|gate)$ + regex: ^functest(-ovn)?-[a-z]+-(daily|check|gate)$ diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index fbc90c2e9..246ceef9e 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -24,7 +24,7 @@ arch_tag: - 'amd64': - slave_label: 'opnfv-build-ubuntu' + slave_label: 'lf-build2' - 'arm64': slave_label: 'opnfv-build-ubuntu-arm' @@ -70,7 +70,7 @@ - xtesting-job-parameters: project: '{project}' branch: '{branch}' - slave_label: 'opnfv-build-ubuntu' + slave_label: 'lf-build2' arch_tag: 'amd64' properties: @@ -133,7 +133,7 @@ branch: '{branch}' - label: name: SLAVE_LABEL - default: 'opnfv-build-ubuntu' + default: 'lf-build2' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index de39f0628..40e0ed6e2 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -105,7 +105,13 @@ fi if [[ "$BRANCH" == "master" ]]; then DOCKER_TAG="latest" -elif [[ -n "${RELEASE_VERSION-}" ]]; then +fi + +if [[ "$BRANCH" =~ "stable" ]]; then + DOCKER_TAG="stable" +fi + +if [[ -n "${RELEASE_VERSION-}" ]]; then DOCKER_TAG=${RELEASE_VERSION} if git checkout ${RELEASE_VERSION}; then echo "Successfully checked out the git tag ${RELEASE_VERSION}" @@ -114,8 +120,6 @@ elif [[ -n "${RELEASE_VERSION-}" ]]; then git tag exit 1 fi -else - DOCKER_TAG="stable" fi if [[ -n "${COMMIT_ID-}" && -n "${RELEASE_VERSION-}" ]]; then diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh deleted file mode 100644 index 7a92e6f1b..000000000 --- a/jjb/releng/opnfv-repo-archiver.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 Linux Foundation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -o errexit -set -o pipefail -export PATH=$PATH:/usr/local/bin/ - -DATE="$(date +%Y%m%d)" - -declare -a PROJECT_LIST -EXCLUDE_PROJECTS="All-Projects|All-Users|securedlab|^test" -CLONE_PATH="$WORKSPACE/opnfv-repos" - -# Generate project list from gerrit -PROJECT_LIST=($(ssh -p 29418 jenkins-ci@gerrit.opnfv.org gerrit ls-projects | egrep -v $EXCLUDE_PROJECTS)) - -echo "Cloning all OPNFV repositories" -echo "------------------------------" - -for PROJECT in "${PROJECT_LIST[@]}"; do - echo "> Cloning $PROJECT" - if [ ! -d "$CLONE_PATH/$PROJECT" ]; then - git clone "https://gerrit.opnfv.org/gerrit/$PROJECT.git" $CLONE_PATH/$PROJECT - else - pushd "$CLONE_PATH/$PROJECT" &>/dev/null - git pull -f origin master - popd &> /dev/null - fi - - # Don't license scan kernel or qemu in kvmfornfv - if [ "$PROJECT" == "kvmfornfv" ]; then - rm -rf "$CLONE_PATH/$PROJECT/"{kernel,qemu} - fi -done - -echo "Finished cloning OPNFV repositories" -echo "-----------------------------------" - -# Copy repos and clear git data -echo "Copying repos to $WORKSPACE/opnfv-archive and removing .git files" -cp -R $CLONE_PATH $WORKSPACE/opnfv-archive -find $WORKSPACE/opnfv-archive -type d -iname '.git' -exec rm -rf {} + -find $WORKSPACE/opnfv-archive -type f -iname '.git*' -exec rm -rf {} + - -# Create archive -echo "Creating archive: opnfv-archive-$DATE.tar.gz" -echo "--------------------------------------" -cd $WORKSPACE -tar -czf "opnfv-archive-$DATE.tar.gz" opnfv-archive && rm -rf opnfv-archive -echo "Archiving Complete." - -echo "Uploading artifacts" -echo "--------------------------------------" - -gsutil cp "$WORKSPACE/opnfv-archive-$DATE.tar.gz" \ - "gs://opnfv-archive/opnfv-archive-$DATE.tar.gz" 2>&1 - -echo "https://storage.googleapis.com/opnfv-archive/opnfv-archive-$DATE.tar.gz" > archive-link.txt - -rm -f opnfv-archive-$DATE.tar.gz - -echo "Finished" diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 05ffd51d9..2cdb31bb0 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -5,7 +5,6 @@ jobs: - 'prune-docker-images' - - 'archive-repositories' - 'check-status-of-slaves' - 'ansible-build-server' - 'generate-artifacts-index-pages' @@ -50,43 +49,6 @@ - timed: '@midnight' - job-template: - name: 'archive-repositories' - - disabled: false - - concurrent: true - - parameters: - - node: - name: SLAVE_NAME - description: Where to create the archive - default-slaves: - - lf-build2 - allowed-multiselect: false - ignore-offline-nodes: true - - triggers: - - timed: '@monthly' - - builders: - - shell: - !include-raw-escape: opnfv-repo-archiver.sh - - publishers: - - email-ext: - content-type: 'text' - failure: false - always: true - body: - ${{FILE,path="archive-link.txt"}} - reply-to: > - helpdesk@opnfv.org - recipients: > - tbramwell@linuxfoundation.org - swinslow@linuxfoundation.org - - -- job-template: name: 'check-status-of-slaves' disabled: false |