X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fpuppet-fdio%2Fpuppet-fdio.yaml;h=e155b926e8015243a85c7ad3b1726fa1235a22f1;hb=c968d018358510376dc9e5f31e849cae99d782f2;hp=82edfea40c6926dd232add1d3a18b61244280cf1;hpb=1a4800952c56743ac8070d3051f423b7bf3bb8c5;p=ci-management.git

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index 82edfea40..e155b926e 100644
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -1,68 +1,66 @@
+---
 - project:
     name: puppet-fdio
     jobs:
-        - 'puppet-module-unit'
-        - 'puppet-fdio-verify-beaker-{stream}-{os}'
+      - 'puppet-module-unit'
+      - 'puppet-fdio-verify-beaker-{stream}-{os}'
     project: 'puppet-fdio'
-    os:
-        - centos7:
-            repo-os-part: 'centos7'
+    os: 'centos7'
+    repo-os-part: 'centos7'
+
     stream:
-        - master:
-            branch: 'master'
-            repo-stream-part: 'master'
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
+
+- project:
+    name: puppet-fdio-view
+    views:
+      - project-view
+    project-name: puppet-fdio
 
 - job-template:
     name: 'puppet-fdio-verify-unit-{puppet_version}-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
+      - gerrit-trigger-patch-submitted:
+          name: '{project}'
+          branch: '{branch}'
 
     builders:
-        - puppet-prepare-node
-        - shell: |
-            if [ "{puppet_version}" != "latest" ]; then
-              export PUPPET_GEM_VERSION='~> {puppet_version}.0'
-            fi
-            mkdir .bundled_gems
-            export GEM_HOME=`pwd`/.bundled_gems
-            gem install bundler --no-rdoc --no-ri --verbose
-            $GEM_HOME/bin/bundle install --retry 3
-            $GEM_HOME/bin/bundle exec rake syntax
-            $GEM_HOME/bin/bundle exec rake lint
-            $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation'
+      - shell: |
+          ./scripts/prepare-node.sh
+          ./scripts/ci-unit-tests.sh {puppet_version}
 
 - job-group:
     name: 'puppet-module-unit'
@@ -79,88 +77,46 @@
     name: 'puppet-fdio-verify-beaker-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: '{os}'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
+      - gerrit-trigger-patch-submitted:
+          name: '{project}'
+          branch: '{branch}'
 
-    builders:
-        - puppet-prepare-node
-        - allow-local-ssh-root
-        - shell: |
-            sudo sysctl -w vm.nr_hugepages=1024
-            cat /proc/meminfo | grep Huge
-            mkdir .bundled_gems
-            export GEM_HOME=`pwd`/.bundled_gems
-            gem install bundler --no-rdoc --no-ri --verbose
-            $GEM_HOME/bin/bundle install --retry 3
-            export BEAKER_set=nodepool-{os}
-            export BEAKER_debug=yes
-            export BEAKER_color=no
-            $GEM_HOME/bin/bundle exec rspec spec/acceptance
-
-- builder:
-    name: puppet-prepare-node
-    builders:
-      - shell: |
-          if [ -f /usr/bin/yum ]; then
-            sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
-          elif [ -f /usr/bin/apt-get ]; then
-            sudo apt-get update
-            sudo apt-get install -y libxml2-dev libxslt-dev zlib1g-dev
-          fi
-
-- builder:
-    name: allow-local-ssh-root
     builders:
       - shell: |
-          echo "" | sudo tee -a /etc/ssh/sshd_config
-          echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
-          echo "    PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
-          echo "" | sudo tee -a /etc/ssh/sshd_config
-          echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
-          echo "    PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
-          mkdir -p .ssh
-          if [ ! -f ~/.ssh/id_rsa.pub ]; then
-            if [ -f ~/.ssh/id_rsa ]; then
-              ssh-keygen -y -f ~/.ssh/id_rsa -b 2048 -P "" > ~/.ssh/id_rsa.pub
-            else
-              ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
-            fi
-          fi
-          sudo mkdir -p /root/.ssh
-          cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
-          if [ -f /usr/bin/yum ]; then
-              sudo systemctl restart sshd
-          elif [ -f /usr/bin/apt-get ]; then
-              sudo service ssh restart
-          fi
+          ./scripts/prepare-node.sh
+          ./scripts/allow-local-ssh-root.sh
+          ./scripts/ci-beaker.sh {os}
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'