X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=193d220e2a5a00272cf5080f8cfad6a9711db26d;hb=8ae777c70c976b09c478f1aec2615ebb901308b0;hp=77b2dae6143ba889f9d0806ca4cee6fbb6772c2a;hpb=853876f42d8d8269a056c56eecc91f459e6edfbd;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 77b2dae61..193d220e2 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -77,11 +77,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "odl-highcpu-2" - tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881" + tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" ##################### # Job configuration # @@ -185,11 +185,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "odl-highcpu-2" - tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881" + tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" ##################### # Job configuration # @@ -492,11 +492,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "odl-highcpu-2" - tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881" + tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" ##################### # Job Configuration # @@ -603,11 +603,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" tools_system_count: "1" tools_system_flavor: "odl-highcpu-2" - tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881" + tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" ##################### # Job configuration # @@ -912,11 +912,11 @@ odl_system_count: 1 odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" docker_system_count: "1" docker_system_flavor: "odl-standard-1" - docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840" + docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200810-015757.604" ##################### # Job Configuration # @@ -1046,17 +1046,17 @@ odl_system_count: 1 odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" openstack_system_count: 1 openstack_system_flavor: "odl-standard-4" - openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485" + openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836" openstack_system2_count: 0 openstack_system2_flavor: "odl-standard-1" - openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485" + openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836" tools_system_count: 1 tools_system_flavor: "odl-highcpu-2" - tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881" + tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" ##################### # Job configuration # @@ -1476,17 +1476,17 @@ odl_system_count: 1 odl_system_flavor: "odl-highcpu-4" - odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474" + odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500" controller-max-mem: "2048m" openstack_system_count: 1 openstack_system_flavor: "odl-standard-4" - openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485" + openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836" openstack_system2_count: 0 openstack_system2_flavor: "odl-standard-1" - openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485" + openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836" tools_system_count: 1 tools_system_flavor: "odl-highcpu-2" - tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881" + tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630" ##################### # Job configuration # @@ -2012,224 +2012,3 @@ - email-notification: email-recipients: "{email-recipients}" email-prefix: "[{project}]" - -##################### -# inttest-csit-apex # -##################### - -- inttest_csit_apex: &inttest_csit_apex - name: inttest-csit-apex - - ##################### - # Default variables # - ##################### - - openstack-cloud: vex - openstack-heat-template: csit-apex-3-instance-type.yaml - openstack-heat-template-dir: openstack-hot - controller-max-mem: "2048m" - - ##################### - # Job configuration # - ##################### - - parameters: - - integration-csit-parameters: - archive-artifacts: "{archive-artifacts}" - branch: "{branch}" - os-cloud: "{os-cloud}" - # CSIT - bundle-url: "{bundle-url}" - repo-url: "{repo-url}" - robot-options: "{robot-options}" - # Controller - controller-scope: "" - controller-max-mem: "{controller-max-mem}" - debug-map: "{debug-map}" - install-features: "{install-features}" - use-features-boot: "{use-features-boot}" - elasticsearch-attribute: "{elasticsearch-attribute}" - - integration-stack-3-type: - vm_0_count: "{apex_controller_count}" - vm_0_flavor: "{apex_controller_flavor}" - vm_0_image: "{apex_controller_image}" - vm_1_count: "1" - vm_1_flavor: "{apex_compute_0_flavor}" - vm_1_image: "{apex_compute_0_image}" - vm_2_count: "1" - vm_2_flavor: "{apex_compute_1_flavor}" - vm_2_image: "{apex_compute_1_image}" - - integration-distribution-branch: - branch: "{branch}" - - integration-distribution-stream: - stream: "{stream}" - - integration-test-plan: - test-plan: "{project}-{functionality}.txt" - - integration-test-suites: - test-suites: "{test-suites}" - - integration-patch-refspec: - branch: "master" - - integration-jdk-version: - jdkversion: "{jre}" - - distribution-karaf-version: - karaf-version: "{karaf-version}" - - string: - name: OPENSTACK_BRANCH - default: "{openstack-branch}" - description: "Openstack version to use with devstack" - - string: - name: IPSEC_VXLAN_TUNNELS_ENABLED - default: "{ipsec-vxlan-tunnels-enabled}" - description: "Enable ipsec over vxlan support for all controllers and computes" - - string: - name: PUBLIC_BRIDGE - default: "{public-bridge}" - description: "Specifies public bridge for provider and external networking" - - string: - name: SECURITY_GROUP_MODE - default: "{security-group-mode}" - description: "Security Group Mode to be used in netvirt aclservice config" - - string: - name: ENABLE_ITM_DIRECT_TUNNELS - default: "{enable-itm-direct-tunnels}" - description: "Tunnel Configuration mode to be used in genius ifm config" - - string: - name: PUBLIC_PHYSICAL_NETWORK - default: "{public-physical-network}" - description: "provider physical network used for flat/vlan networks" - - string: - name: ODL_SNAT_MODE - default: "{odl-snat-mode}" - description: "The SNAT mode to be configured - options are conntrack/controller." - - string: - name: GROUP_ADD_MOD_ENABLED - default: "{group-add-mod-enabled}" - description: "The Group add mod enabled mode to be configured - options are true/false." - - scm: - - integration-gerrit-scm: - basedir: "test" - refspec: "$PATCHREFSPEC" - branch: "master" - - triggers: - - timed: "{schedule}" - - builders: - - lf-infra-pre-build - - integration-stack-3-type: - openstack-cloud: "{openstack-cloud}" - openstack-heat-template: "{openstack-heat-template}" - openstack-heat-template-dir: "{openstack-heat-template-dir}" - - integration-install-robotframework - - integration-detect-variables - - integration-install-common-functions - - inject: - properties-file: "env.properties" - - integration-get-apex-addresses - - inject: - properties-file: "slave_addresses.txt" - - integration-apex-run-tests - - integration-cleanup-tmp - - publishers: - - email-notification: - email-recipients: "{email-recipients}" - email-prefix: "[{project}]" - - integration-csit-publish: - robot_other_files: - - tempest_results.html - robot-pass-threshold: 100.0 - robot-unstable-threshold: 0.0 - - lf-stack-delete: - openstack-cloud: "{openstack-cloud}" - - lf-infra-publish - -- job-template: - # yamllint disable-line rule:line-length - name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}" - id: inttest-csit-apex - <<: *inttest_csit_common - # yamllint disable-line rule:key-duplicates - <<: *inttest_csit_apex - -- job-template: - # yamllint disable-line rule:line-length - name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}" - id: inttest-csit-apex-custom - <<: *inttest_csit_common - # yamllint disable-line rule:key-duplicates - <<: *inttest_csit_apex - - parameters: - - integration-csit-parameters: - archive-artifacts: "{archive-artifacts}" - branch: "{branch}" - os-cloud: "{os-cloud}" - # CSIT - bundle-url: "{bundle-url}" - repo-url: "{repo-url}" - robot-options: "{robot-options}" - # Controller - controller-scope: "" - controller-max-mem: "{controller-max-mem}" - debug-map: "{debug-map}" - install-features: "{install-features}" - use-features-boot: "{use-features-boot}" - elasticsearch-attribute: "{elasticsearch-attribute}" - - integration-stack-3-type: - vm_0_count: "{apex_controller_count}" - vm_0_flavor: "{apex_controller_flavor}" - vm_0_image: "{apex_controller_image}" - vm_1_count: "1" - vm_1_flavor: "{apex_compute_0_flavor}" - vm_1_image: "{apex_compute_0_image}" - vm_2_count: "1" - vm_2_flavor: "{apex_compute_1_flavor}" - vm_2_image: "{apex_compute_1_image}" - - integration-distribution-branch: - branch: "{branch}" - - integration-distribution-stream: - stream: "{stream}" - - integration-test-plan: - test-plan: "{testplan}" - - integration-test-suites: - test-suites: "{test-suites}" - - integration-patch-refspec: - branch: "master" - - integration-jdk-version: - jdkversion: "{jre}" - - distribution-karaf-version: - karaf-version: "{karaf-version}" - - string: - name: OPENSTACK_BRANCH - default: "{openstack-branch}" - description: "Openstack version to use with devstack" - - string: - name: IPSEC_VXLAN_TUNNELS_ENABLED - default: "{ipsec-vxlan-tunnels-enabled}" - description: "Enable ipsec over vxlan support for all controllers and computes" - - string: - name: PUBLIC_BRIDGE - default: "{public-bridge}" - description: "Specifies public bridge for provider and external networking" - - string: - name: SECURITY_GROUP_MODE - default: "{security-group-mode}" - description: "Security Group Mode to be used in netvirt aclservice config" - - string: - name: ENABLE_ITM_DIRECT_TUNNELS - default: "{enable-itm-direct-tunnels}" - description: "Tunnel Configuration mode to be used in genius ifm config" - - string: - name: PUBLIC_PHYSICAL_NETWORK - default: "{public-physical-network}" - description: "provider physical network used for flat/vlan networks" - - string: - name: ODL_SNAT_MODE - default: "{odl-snat-mode}" - description: "The SNAT mode to be configured - options are conntrack/controller." - - string: - name: GROUP_ADD_MOD_ENABLED - default: "{group-add-mod-enabled}" - description: "The Group add mod enabled mode to be configured - options are true/false."