X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management.yaml;h=f6000c7063b4d79436bf60058bf865889ee6b69d;hb=11143275c42d7f39b07fa1abc3b65884bd4eedce;hp=141731bc4b4a46dc0678500345f503eb43ab1f5c;hpb=ac56382cf82c679d0e71a2ac67c12db2b8340384;p=ci-management.git

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 141731bc4..f6000c706 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -1,216 +1,70 @@
 ---
+- project:
+    name: ci-management-project-view
+    project-name: ci-management
+    views:
+      - project-view
+
+- project:
+    name: ci-management-info
+    project-name: ci-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: ci-management
+    branch: master
+
 - project:
     name: ci-management-jobs
     jobs:
-      - '{project-name}-ci-jobs'
-      - '{project}-verify-packer'
-      - '{project}-merge-packer-{platforms}-{templates}'
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge
+      - gerrit-jjb-verify
+      - gerrit-packer-verify
 
     project: 'ci-management'
     project-name: 'ci-management'
     archive-artifacts: '**/*.log'
     branch: 'master'
     build-timeout: '60'
-    build-node: 'centos7-basebuild-2c-1g'
-    platforms:
-      - centos
-      - ubuntu-16.04
-
-    templates:
-      - basebuild
-      - docker
-      - redis
-
-    exclude:
-      # only build the docker image on ubuntu at present
-      - platforms: centos
-        templates: docker
-
-- job-template:
-    name: '{project}-verify-jjb'
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'jjb/**'
-
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'jjbini'
-              variable: 'JJBINI'
-      - shell: |
-          virtualenv $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install jenkins-job-builder
-          jenkins-jobs -l DEBUG --conf $JJBINI test -o archives/job_output jjb/
-          gzip archives/job_output/*
-      - ci-management-check-unicode
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    name: '{project}-merge-jjb'
-
-    project-type: freestyle
-    node: '{build-node}'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
+    build-node: 'centos7-builder-2c-1g'
+    jjb-version: 4.1.0
+    # configure the gerrit-jjb-verify job
+    build-node-label-check: true
+    build-node-label-list: ""
 
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'jjb/**'
-
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'jjbini'
-              variable: 'JJBINI'
-      - shell: |
-          virtualenv $WORKSPACE/venv
-          source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install jenkins-job-builder
-          jenkins-jobs --conf $JJBINI update --delete-old --workers 4 jjb/
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-- job-template:
-    name: '{project}-verify-packer'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
-
-    builders:
-      - packer-validate
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-- job-template:
-    name: '{project}-merge-packer-{platforms}-{templates}'
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: 14
+- project:
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
 
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-2c-1g
 
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+    jenkins-urls: >
+        https://jenkins.onap.org
+        https://jenkins.onap.org/sandbox
+    openstack-cloud: vex
 
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
+- project:
+    name: openstack-update-cloud-images
+    jobs:
+      - gerrit-openstack-update-cloud-image
 
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: 'packer/**'
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: '**/*.log'
+    jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-    builders:
-      - packer-validate
-      - packer-build:
-          platform: '{platforms}'
-          template: '{templates}'
+    build-node: centos7-builder-2c-1g
+    # update-cloud-image: true
+    build-timeout: 10
 
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+    gerrit-user: "jenkins-$SILO"
+    gerrit-host: "gerrit.onap.org"
+    gerrit-topic: "update-cloud-image"
+    reviewers-email: "onap-jobbuilder@jenkins.onap.org"