Jobs for test build with newton and master branches of OS

On check we want to build components for every commit with both branches. Depends-On: Ie722703b4e17a4aff1870cea68a2192a6dc5ce4c Depends-On: Ie844911bd41af1d54ef82640eb2454410a8c935d Depends-On: I41fc1c37b4776e63b46aa538a4d69f9ebc707d17 Depends-On: Ib378b7272f6693f994f78fe114ff904ed69979f1 Depends-On: Ie2171a74f70d71b5592b274ded506aec4e96d6fa Depends-On: Id862aff698928cae2ac29ab818f6b37ad1224740 Depends-On: I15dd16370822a8ef2cbc36a2b6ea276c9d027b66 Depends-On: Ia167d4af5c3ab31802f570db0453eaaa7fe7bffe Depends-On: I739455b0ffb533737756175c5d1831f4b343e0ca Depends-On: Ibcb6e38e9dbb7d71bb8c26d861df2be441e8d503 Depends-On: I243489904a5addb1db71e73de21bde4ca8319382 Depends-On: Ia59ccd4cbf8c49d8b9d5d9213585370f1d4eb444 Change-Id: Ib387c431832738167793aadac51f86a674ef4a0c
2016-09-29 14:30:54 +02:00 · 2016-09-29 14:30:54 +02:00 · ddc2aa9186
parent 62df710fc8
commit ddc2aa9186
6 changed files with 188 additions and 42 deletions
--- a/jenkins-tp/jobs/build-branch-job-template.yaml
+++ b/jenkins-tp/jobs/build-branch-job-template.yaml
@ -0,0 +1,19 @@
+#
+# Template used to execute tox tests
+#
+- job-template:
+    name: test-{os_version}-build-{name}
+    builders:
+      - get-from-zuul-container
+      - build-image-branch:
+          name: '{name}'
+          repos: '{repos}'
+          GIT_BRANCH: '{os_version}'
+    concurrent: true
+    description: |
+      Test build {name} image job
+    node: standard
+    wrappers:
+      - ng-cleanup
+    triggers:
+      - zuul
--- a/jenkins-tp/jobs/build-job-template.yaml
+++ b/jenkins-tp/jobs/build-job-template.yaml
@ -5,9 +5,10 @@
    name: test-build-{name}
    builders:
      - get-from-zuul-container
-      - build-image:
+      - build-image-branch:
          name: '{name}'
          repos: '{repos}'
+          GIT_BRANCH: 'master'
    concurrent: true
    description: |
      Test build {name} image job
--- a/jenkins-tp/jobs/builders/build-image-branch.sh
+++ b/jenkins-tp/jobs/builders/build-image-branch.sh
@ -0,0 +1,65 @@
+#!/bin/bash -xe
+
+JOB_NAME={name}
+OS_VER={GIT_BRANCH}
+REPO_LIST={repos}
+
+if [ $OS_VER == "master" ]; then
+    GIT_BRANCH=master
+else
+    GIT_BRANCH=stable/newton
+fi
+tee fuel-ccp/ccp-test.yaml << EOF
+debug: True
+builder:
+  no_cache: True
+images:
+  namespace: $JOB_NAME-build
+  tag: latest
+  maintainer: mirantis@mirantis.com
+repositories:
+  path: $WORKSPACE/containers/openstack
+  skip_empty: True
+  names: [$REPO_LIST]
+sources:
+  openstack/cinder:
+    git_url: https://github.com/openstack/cinder.git
+    git_ref: $GIT_BRANCH
+  openstack/ironic:
+    git_url: https://github.com/openstack/ironic.git
+    git_ref: $GIT_BRANCH
+  openstack/murano:
+    git_url: https://github.com/openstack/murano.git
+    git_ref: $GIT_BRANCH
+  openstack/murano-dashboard:
+    git_url: https://github.com/openstack/murano-dashboard.git
+    git_ref: $GIT_BRANCH
+  openstack/sahara:
+    git_url: https://github.com/openstack/sahara.git
+    git_ref: $GIT_BRANCH
+  openstack/sahara-dashboard:
+    git_url: https://github.com/openstack/sahara-dashboard.git
+    git_ref: $GIT_BRANCH
+  openstack/keystone:
+    git_url: https://github.com/openstack/keystone.git
+    git_ref: $GIT_BRANCH
+  openstack/horizon:
+    git_url: https://github.com/openstack/horizon.git
+    git_ref: $GIT_BRANCH
+  openstack/nova:
+    git_url: https://github.com/openstack/nova.git
+    git_ref: $GIT_BRANCH
+  openstack/neutron:
+    git_url: https://github.com/openstack/neutron.git
+    git_ref: $GIT_BRANCH
+  openstack/heat:
+    git_url: https://github.com/openstack/heat.git
+    git_ref: $GIT_BRANCH
+  openstack/glance:
+    git_url: https://github.com/openstack/glance.git
+    git_ref: $GIT_BRANCH
+EOF
+
+cd fuel-ccp
+tox -e venv -- ccp --config-file ccp-test.yaml build
+
--- a/jenkins-tp/jobs/macros.yaml
+++ b/jenkins-tp/jobs/macros.yaml
@ -121,32 +121,9 @@
      - shell: 'tox -v -e {tox-test}'

 - builder:
-    name: build-image
+    name: build-image-branch
    builders:
-      - shell: |
-          #!/bin/bash -xe
-          virtualenv {name}env
-          source {name}env/bin/activate
-          pip install --upgrade pip
-          pip install fuel-ccp/
-          cat > ccp-test.yaml << EOF
-          debug: True
-          builder:
-            no_cache: True
-          images:
-            namespace: {name}build
-            tag: latest
-            maintainer: mirantis@mirantis.com
-          repositories:
-            path: containers/openstack
-            skip_empty: True
-            names: [{repos}]
-          EOF
-
-          cat ccp-test.yaml
-          ccp --config-file ccp-test.yaml build
-
-          deactivate
+      - shell: !include-raw: builders/build-image-branch.sh

 - builder:
    name: get-from-zuul-container
--- a/jenkins-tp/jobs/projects.yaml
+++ b/jenkins-tp/jobs/projects.yaml
@ -1,3 +1,12 @@
+- project:
+    name: cinder
+    os_version:
+      - master
+      - newton
+    jobs:
+      - test-{os_version}-build-{name}:
+          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-cinder
+
 - project:
    name: debian-base
    jobs:
@ -12,26 +21,47 @@

 - project:
    name: glance
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-glance

 - project:
    name: heat
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-heat

 - project:
    name: horizon
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-horizon

 - project:
-    name: keystone
+    name: ironic
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
+          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-ironic
+
+- project:
+    name: keystone
+    os_version:
+      - master
+      - newton
+    jobs:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-keystone

 - project:
@ -49,21 +79,39 @@
          tox-test: py27

 - project:
-    name: neutron
+    name: murano
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
+          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-murano
+
+- project:
+    name: neutron
+    os_version:
+      - master
+      - newton
+    jobs:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-neutron

 - project:
    name: nova
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-nova

 - project:
    name: openstack-base
+    os_version:
+      - master
+      - newton
    jobs:
-      - test-build-{name}:
+      - test-{os_version}-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base

 - project:
@ -72,6 +120,15 @@
      - test-build-{name}:
          repos: fuel-ccp-debian-base,fuel-ccp-rabbitmq

+- project:
+    name: sahara
+    os_version:
+      - master
+      - newton
+    jobs:
+      - test-{os_version}-build-{name}:
+          repos: fuel-ccp-debian-base,fuel-ccp-openstack-base,fuel-ccp-sahara
+
 - project:
    name: stacklight
    jobs:
--- a/zuul-tp/layout.yaml
+++ b/zuul-tp/layout.yaml
@ -61,6 +61,11 @@ projects:
    check:
      - fuel-ccp-gate-job

+  - name: openstack/fuel-ccp-cinder
+    check:
+      - test-master-build-cinder
+      - test-newton-build-cinder
+
  - name: openstack/fuel-ccp-debian-base
    check:
      - test-build-debian-base
@ -75,19 +80,28 @@ projects:

  - name: openstack/fuel-ccp-glance
    check:
-      - test-build-glance
+      - test-master-build-glance
+      - test-newton-build-glance

  - name: openstack/fuel-ccp-heat
    check:
-      - test-build-heat
+      - test-newton-build-heat
+      - test-master-build-heat

  - name: openstack/fuel-ccp-horizon
    check:
-      - test-build-horizon
+      - test-newton-build-horizon
+      - test-master-build-horizon
+
+  - name: openstack/fuel-ccp-ironic
+    check:
+      - test-newton-build-ironic
+      - test-master-build-ironic

  - name: openstack/fuel-ccp-keystone
    check:
-      - test-build-keystone
+      - test-newton-build-keystone
+      - test-master-build-keystone

  - name: openstack/fuel-ccp-mariadb
    check:
@ -97,22 +111,35 @@ projects:
    check:
      - test-build-memcached

+  - name: openstack/fuel-ccp-murano
+    check:
+      - test-newton-build-murano
+      - test-master-build-murano
+
  - name: openstack/fuel-ccp-neutron
    check:
-      - test-build-neutron
+      - test-newton-build-neutron
+      - test-master-build-neutron

  - name: openstack/fuel-ccp-nova
    check:
-      - test-build-nova
+      - test-newton-build-nova
+      - test-master-build-nova

  - name: openstack/fuel-ccp-openstack-base
    check:
-      - test-build-openstack-base
+      - test-newton-build-openstack-base
+      - test-master-build-openstack-base

  - name: openstack/fuel-ccp-rabbitmq
    check:
      - test-build-rabbitmq

+  - name: openstack/fuel-ccp-sahara
+    check:
+      - test-newton-build-sahara
+      - test-master-build-sahara
+
  - name: openstack/fuel-ccp-stacklight
    check:
      - test-build-stacklight