Merge "Remove mitaka logic from devstack deploy logic"
authorJamo Luhrsen <jluhrsen@redhat.com>
Fri, 28 Apr 2017 16:33:00 +0000 (16:33 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 28 Apr 2017 16:33:00 +0000 (16:33 +0000)
jjb/autorelease/autorelease-projects.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml [new file with mode: 0644]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/integration-detect-variables.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration4-templates.yaml [new file with mode: 0644]
jjb/packaging/include-raw-test-puppet.sh
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml [new file with mode: 0644]
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml

index a53c459456c2f48c441a4d90511390c8978d454e..b6f26b798f35e7e9f3668858b5150be530823e0d 100644 (file)
             fail-on-missing: true
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
+
+
+###
+# TODO: Remove this job once carbon tests failures are resolved
+###
+
+- project:
+    name: autorelease-projects-notests
+    jobs:
+      - 'autorelease-release-notests-{stream}'
+
+    stream:
+      - carbon:
+          next-release-tag: Carbon
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
+          integration-test: carbon
+          karaf-version: karaf3
+
+
+    project: 'releng/autorelease'
+    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch all-bundles.tar.gz'
+
+
+# Autorelease build jobs
+- job-template:
+    name: 'autorelease-release-notests-{stream}'
+
+    project-type: freestyle
+    node: centos7-autorelease-4c-16g
+    jdk: '{jdk}'
+    cron: 'H 0 * * *'
+
+    properties:
+      - build-discarder:
+          days-to-keep: '30'
+          num-to-keep: 40
+          artifact-num-to-keep: 1
+    # Make sure we only archive the last artifact until we figure out why
+    # autorelease carbon is not generating a staging repo.
+    #   - opendaylight-infra-properties:
+    #       build-days-to-keep: '30'
+
+    parameters:
+      - maven-exec:
+          maven-version: 'mvn33'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - autorelease-release-tag:
+          release-tag: '{next-release-tag}'
+      - autorelease-release-branch:
+          release-branch: '{branch}'
+
+    scm:
+      - git:
+          credentials-id: 'opendaylight-jenkins-ssh'
+          url: '$GIT_BASE'
+          refspec: '$GERRIT_REFSPEC'
+          branches:
+            - '$GERRIT_BRANCH'
+          choosing-strategy: 'gerrit'
+          skip-tag: true
+          submodule:
+            recursive: true
+            timeout: 60
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '1440'
+
+    triggers:
+      - timed: '{cron}'
+
+    builders:
+      # force jenkins install of maven version before any shell scripts use it
+      - maven-target:
+          maven-version: 'mvn33'
+          goals: '-version'
+          settings: 'autorelease-settings'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
+      - wipe-local-maven-repo
+      - jacoco-nojava-workaround
+      - shell: "./scripts/list-project-dependencies.sh"
+      - autorelease-determine-merge-order
+      - autorelease-cfp:
+          autorelease-settings: 'autorelease-settings'
+          odl-global-settings: 'odl-global-settings'
+      - autorelease-generate-taglist
+      - autorelease-distribute-taglist
+      - distribute-build-url:
+          path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
+      - autorelease-generate-release-patches
+      # In a perfect world projects should be releasing separately and we consume them
+      # via a project that pulls the release bits from each project from Nexus.
+      # Keep the patches compatible with that ideal, but apply an edit
+      # to enable building in a single maven reactor afterwards.
+      - autorelease-fix-relative-paths
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: |
+              clean deploy
+              -Pintegrationtests,docs,repoBuild
+              -Dcheckstyle.skip=true
+              -DskipTests=true
+              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+          settings: 'autorelease-settings'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
+      - autorelease-maven-deploy
+      - autorelease-get-integration-test-variables
+      - autorelease-maven-sources:
+          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
+          maven-version: 'mvn33'
+          settings: 'autorelease-settings'
+          global-settings: 'odl-global-settings'
+      - autorelease-maven-sources-post-process
+      - shell: |
+          mkdir -p archives/
+          cp *.log *.prop $_
+
+    publishers:
+      - opendaylight-infra-notify-status
+      - opendaylight-infra-sysstats
+      - archive:
+          # Need to archive dependencies.log in Jenkins to provide a simple
+          # way for downstream jobs to pull the latest version of this file
+          # in their builds.
+          # TODO stop archiving **/*.zip once we figure out why artifacts are
+          #      not deploying to Nexus
+          artifacts: 'dependencies.log, **/*.zip, /var/log/sa/*'
+      - trigger-parameterized-builds:
+          - project: 'integration-distribution-test-{integration-test}'
+            condition: UNSTABLE_OR_BETTER
+            property-file: variables.jenkins-trigger
+            fail-on-missing: true
+          - project: 'integration-distribution-test-{integration-test}'
+            condition: FAILED
+          - project: 'integration-sanity-test-{integration-test}'
+            condition: UNSTABLE_OR_BETTER
+            property-file: variables.jenkins-trigger
+            fail-on-missing: true
+          - project: 'integration-sanity-test-{integration-test}'
+            condition: FAILED
+          - project: 'packaging-build-rpm-master'
+            condition: UNSTABLE_OR_BETTER
+            predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
+            property-file: variables.jenkins-trigger
+            fail-on-missing: true
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
new file mode 100644 (file)
index 0000000..76edf60
--- /dev/null
@@ -0,0 +1,33 @@
+---
+- project:
+    name: mdsal-csit-dom-data-broker-explicit-leader-movement-longevity
+    jobs:
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'controller'
+
+    # The functionality under test
+    functionality: 'ddb-expl-lead-movement-longevity'
+
+    # Project branches
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+
+    install:
+      - only:
+          scope: 'only'
+
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
+
+    # Built timeout
+    build-timeout: '1500'
index 756341427a7792e89610a1cf814ae1f9e35bf464..e1f68aca986374a95e291afb34acf77977f46a3b 100644 (file)
@@ -3,6 +3,7 @@
     name: distribution-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit4-1node-{functionality}-{install}-carbon'
 
     # The project name
     project: 'distribution'
index 009e0fe4b45304a406a4614e27b4067bd5cab0e0..78067e9bd6a88203f7d70be3c6f64e51fbb41bb0 100644 (file)
@@ -20,7 +20,7 @@ if [ ${BUNDLE_URL} == 'last' ]; then
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
     ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-elif [[ "${BUNDLE_URL}" == *"distribution-check"* ]]; then
+elif [[ "${BUNDLE_URL}" == *"jenkins"* ]]; then
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
     BUNDLEFOLDER="${BUNDLE//.zip}"
index 878b59eddf14dda81bab95f2b16d8f0faa598f4c..b71eea9d5514b5e34a8d7c887c5819717d26fa86 100644 (file)
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
     project-type: freestyle
diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml
new file mode 100644 (file)
index 0000000..b8ca58c
--- /dev/null
@@ -0,0 +1,112 @@
+---
+- job-template:
+    name: '{project}-csit4-1node-{functionality}-{install}-carbon'
+    # Keep synchronized with *-csit-* please.
+    disabled: false
+
+    project-type: freestyle
+    node: centos7-robot-2c-2g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: 'stable/carbon'
+          refspec: 'refs/heads/stable/carbon'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: 'stable/carbon'
+      - integration-distribution-stream:
+          stream: 'carbon'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-controller-scope:
+          controller-scope: '{scope}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - integration-stream-test-plan:
+          stream-test-plan: '{project}-{functionality}-carbon.txt'
+      - integration-test-plan:
+          test-plan: '{project}-{functionality}.txt'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: 'openjdk8'
+      - distribution-karaf-version:
+          karaf-version: karaf4
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: 'test'
+          refspec: '$PATCHREFSPEC'
+          branch: 'master'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - integration-infra-stack:
+          stack-template: '{stack-template}'
+          vm_0_count: '1'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-get-slave-addresses
+      - inject:
+          properties-file: 'slave_addresses.txt'
+      - integration-detect-variables
+      - integration-deploy-controller-run-test
+      - integration-cleanup-tmp
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project}]'
+      - plot:
+          - title: '{01-plot-title}'
+            yaxis: '{01-plot-yaxis}'
+            group: '{01-plot-group}'
+            num-builds: '5400'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-carbon-{01-plot-data-file}-history.csv'
+            series:
+              - file: '{01-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+          - title: '{02-plot-title}'
+            yaxis: '{02-plot-yaxis}'
+            group: '{02-plot-group}'
+            num-builds: '5400'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-carbon-{02-plot-data-file}-history.csv'
+            series:
+              - file: '{02-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+
index cb015679bb539f54699ed6963cbb1ce00e2ac30c..cd063e2e620eded47156d88967b08960dcfee7ee 100644 (file)
@@ -9,12 +9,8 @@ set -ex -o pipefail
 # Adapted from puppet-opendaylight/Vagrantfile
 # https://github.com/dfarrell07/puppet-opendaylight/blob/master/Vagrantfile
 
-# Update Int/Pack's puppet-opendaylight submodule to latest master
-pushd "$WORKSPACE/packaging"
-git submodule init
-git submodule update --remote
-
 # Install system-wide dependencies
+# TODO: Are all of these still needed?
 sudo yum install -y ruby-devel gcc-c++ zlib-devel patch redhat-rpm-config make rubygems
 
 # Install RVM to help build recent version of Ruby
@@ -35,9 +31,9 @@ ruby --version
 # Install gems dependencies of puppet-opendaylight via Bundler
 gem install bundler
 echo export PATH="\\$PATH:/usr/local/bin" >> "$HOME/.bashrc"
-pushd "$WORKSPACE/packaging/puppet/puppet-opendaylight"
+pushd "$WORKSPACE/puppet"
 bundle install
 bundle update
 
-# Quick+important tests: Linting, rspec and Beaker on CentOS container tests
-bundle exec rake sanity
+# Execute set of tests passed as param from job
+bundle exec rake "$TEST_SUITE"
index 612c728dba95904fb1be16c9cd6523ef9fa5a4b0..15e880af933efacf710a6ccdad7cec4390f0c570 100644 (file)
@@ -4,13 +4,12 @@
     project-name: packaging
 
     jobs:
-      - '{project-name}-verify-python-{stream}'
+      - '{project-name}-verify-tox-{stream}'
       - 'packaging-build-rpm-{stream}'
       - 'packaging-build-rpm-snap-{stream}'
       - 'packaging-build-deb-{stream}'
       - 'packaging-test-rpm-{stream}'
       - 'packaging-test-deb-{stream}'
-      - 'packaging-test-puppet-{stream}'
       - 'packaging-test-ansible-rpm-{stream}'
       - 'packaging-test-ansible-deb-{stream}'
 
       - master:
           branch: 'master'
 
-- job-template:
-    name: 'packaging-test-puppet-{stream}'
-
-    node: centos7-docker-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
-
-    triggers:
-      - timed: '@daily'
-
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
new file mode 100644 (file)
index 0000000..53b59d3
--- /dev/null
@@ -0,0 +1,97 @@
+---
+- project:
+    name: puppet
+    project-name: puppet
+
+    jobs:
+      - '{project-name}-verify-tox-{stream}'
+      - 'puppet-test-sanity-{stream}'
+      - 'puppet-test-full-{stream}'
+
+    project: 'integration/packaging/puppet-opendaylight'
+
+    stream:
+      - master:
+          branch: 'master'
+
+- job-template:
+    name: 'puppet-test-sanity-{stream}'
+
+    node: centos7-docker-2c-4g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: TEST_SUITE
+          default: 'sanity'
+          description: 'Set of tests to execute, Rakefile task'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '{project-name}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-puppet.sh
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+- job-template:
+    name: 'puppet-test-full-{stream}'
+
+    node: centos7-docker-2c-4g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: TEST_SUITE
+          default: 'acceptance_dock'
+          description: 'Set of tests to execute, Rakefile task'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '{project-name}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-puppet.sh
+
+    triggers:
+      - timed: '@daily'
index 87109833aaa8de32528d43311b387e6ab395b54f..9ec03537b60a8775728f5642ee0d0de755fbab7d 100644 (file)
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
         controller-csit-3node-drb-precedence-longevity-only-nitrogen,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
         distribution-deploy-nitrogen,
         distribution-offline-nitrogen,
         openflowplugin-csit-1node-periodic-longevity-only-nitrogen
         controller-csit-3node-cs-partnheal-longevity-only-carbon,
         controller-csit-3node-drb-partnheal-longevity-only-carbon,
         controller-csit-3node-drb-precedence-longevity-only-carbon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
         distribution4-deploy-carbon,
         netvirt-csit-1node-openstack-mitaka-upstream-stateful-nitrogen,
         netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-mitaka-upstream-transparent-nitrogen,
+        netvirt-csit-1node-openstack-newton-nodl-v2-extensions-sfc-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-transparent-nitrogen,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-nitrogen,
index 8d981d718999b92b40c99eaa4100640bdf173094..2f309173fb5edde835affdbc92d719e9a5afc2a2 100644 (file)
 
     triggers:
       - reverse:
-          jobs: 'builder-merge'
+          jobs: 'builder-jjb-merge'
 
     builders:
       - shell: |