From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Fri, 26 Oct 2018 20:44:28 +0000 (-0500)
Subject: Clean up ci-jobs
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=ceaed0e8a5c4a0a0743c348c1989e7ffa117fb71;p=ci-management.git

Clean up ci-jobs

Removing templates that are no longer needed with global-jjb

Change-Id: I7df2f8cf6265e77df11b15b8dd43edb62906b6f2
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 411af8f24..92c6c8858 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -9,253 +9,3 @@
     build-node: centos7-builder-2c-2g
     build-timeout: 30
     jjb-version: 2.6.0
-
-- project:
-    name: ci-management-jobs
-    jobs:
-      - 'ci-management-verify-packer'
-      - 'ci-management-merge-packer-{platforms}-{templates}'
-
-    platforms:
-      - centos
-      - ubuntu-16.04
-
-    templates:
-      - basebuild
-
-    project: ci-management
-    branch: master
-
-- job-template:
-    name: ci-management-verify-jjb
-
-    project-type: freestyle
-    node: jjb
-    concurrent: true
-
-    build-discarder:
-      daysToKeep: 30
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: 5
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-
-    scm:
-      - gerrit-trigger-scm-recursive:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell: |
-          jenkins-jobs test --recursive -o job_output jjb/
-      - ci-management-check-unicode
-
-    publishers:
-      - archive-artifacts:
-          artifacts: 'job_output/*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'ci-management-merge-jjb'
-
-    project-type: freestyle
-    node: jjb
-
-    build-discarder:
-      daysToKeep: 30
-      numToKeep: 40
-      artifactDaysToKeep: -1
-      artifactNumToKeep: 5
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-
-    scm:
-      - gerrit-trigger-scm-recursive:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: ''
-          choosing-strategy: 'gerrit'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: 60
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell: |
-          pip freeze
-          jenkins-jobs --version
-          jenkins-jobs update --recursive --delete-old --workers 4 jjb/
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'ci-management-verify-packer'
-    project-type: freestyle
-    node: ubuntu1604-basebuild-4c-4g
-    concurrent: true
-
-    properties:
-      - fdio-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          build-num-to-keep: '{build-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: 'refs/heads/{branch}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - ssh-agent-credentials:
-          users:
-            - 'jenkins-gerrit-credentials'
-
-    triggers:
-      - timed: 'H H 1 * *'
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'true'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'ci-management'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths:
-                - compare-type: ANT
-                  pattern: packer/**
-
-    builders:
-      - packer-validate:
-
-    publishers:
-      - archive:
-          artifacts: 'packer/*.log'
-          allow-empty: 'true'
-          only-if-success: 'true'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'ci-management-merge-packer-{platforms}-{templates}'
-    project-type: freestyle
-    node: ubuntu1604-basebuild-4c-4g
-    concurrent: true
-
-    properties:
-      - fdio-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          build-num-to-keep: '{build-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - gerrit-refspec-parameter:
-          refspec: 'refs/heads/{branch}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - '$GERRIT_BRANCH'
-          choosing-strategy: 'default'
-          submodule-recursive: true
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      - ssh-agent-credentials:
-          users:
-            - 'jenkins-gerrit-credentials'
-
-    triggers:
-      - timed: 'H H 1 * *'
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'ci-management'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'packer/vars/{platforms}.json'
-                - compare-type: ANT
-                  pattern: 'packer/templates/{templates}.json'
-                - compare-type: ANT
-                  pattern: 'packer/provision/{templates}.sh'
-                - compare-type: ANT
-                  pattern: 'packer/provision/system_reseal.sh'
-                - compare-type: ANT
-                  pattern: 'packer/provision/rh-user_data.sh'
-                - compare-type: ANT
-                  pattern: 'packer/provision/baseline.sh'
-
-    builders:
-      - packer-validate:
-      - packer-build:
-          platform: '{platforms}'
-          template: '{templates}'
-
-    publishers:
-      - archive:
-          artifacts: 'packer/*.log'
-          allow-empty: 'true'
-          only-if-success: 'true'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'