X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management.yaml;h=25d7b8c2ea79f1dc8aa52a3d8a068d71e70995ff;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=6f2a3db8efe00387e8b2fdbd06f580dfaddff991;hpb=d934638b8e49b8ef53e274d505b3f1fe7b636bb2;p=ci-management.git

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 6f2a3db8e..25d7b8c2e 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -1,119 +1,63 @@
 ---
+- project:
+    name: ci-management-project-view
+    project-name: ci-management
+    views:
+      - project-view
+
 - project:
     name: ci-management-jobs
     jobs:
-      - '{project-name}-ci-jobs'
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge:
+          disable-job: true
+      - gerrit-jjb-verify:
+          disable-job: true
       - gerrit-packer-verify
 
-    project: 'ci-management'
-    project-name: 'ci-management'
-    archive-artifacts: '**/*.log'
-    branch: 'master'
-    build-timeout: '60'
-    build-node: 'centos7-builder-2c-1g'
-    jjb-version: 2.0.0
-
-- 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
+    project: "ci-management"
+    project-name: "ci-management"
+    archive-artifacts: "**/*.log"
+    branch: "master"
+    build-timeout: "60"
+    build-node: "centos8-builder-2c-1g"
+    jjb-version: 5.0.2
+    # configure the gerrit-jjb-verify job
+    build-node-label-check: true
+    build-node-label-list: ""
 
-    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
-
-    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}'
+- project:
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
 
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: 'jjb/**'
+    project: ci-management
+    project-name: ci-management
+    build-node: centos8-builder-2c-1g
 
-    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/
+    jenkins-urls: >
+      https://jenkins.onap.org
+      https://jenkins.onap.org/sandbox
+    openstack-cloud: vex
 
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+- project:
+    name: openstack-update-cloud-images
+    jobs:
+      - gerrit-openstack-update-cloud-image
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
+    jenkins-ssh-credential: onap-jenkins-ssh
+
+    build-node: centos8-builder-2c-1g
+    # update-cloud-image: true
+    build-timeout: 10
+
+    gerrit-user: "jenkins-$SILO"
+    gerrit-host: "gerrit.onap.org"
+    gerrit-topic: "update-cloud-image"
+    reviewers-email: "onap-jobbuilder@jenkins.onap.org"