From: Thanh Ha Date: Fri, 13 Jul 2018 00:12:41 +0000 (-0400) Subject: Remove unused jjb job templates X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8fc647e57a78482870b7b87d18f4e003b5ca6b5f;p=ci-management.git Remove unused jjb job templates ONAP is using global-jjb for these jobs now so the ones that exist in this repo are now unused. Clean them up. Issue-ID: CIMAN-1 Change-Id: Ibc7c2844f27e084cb7253bb6edda89ad4fed9292 Signed-off-by: Thanh Ha --- diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index a7eb833e0..c39cb7e59 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -12,108 +12,3 @@ build-timeout: '60' build-node: 'centos7-builder-2c-1g' jjb-version: 2.0.3 - -- 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 - - 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}' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index d7ca14378..abf7a83f3 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -4,12 +4,6 @@ # vim: sw=2 ts=2 sts=2 et : # BUILDERS -- builder: - name: ci-management-check-unicode - builders: - - shell: | - $WORKSPACE/scripts/check-unicode.sh jjb/ - - builder: name: provide-maven-settings builders: diff --git a/scripts/.gitignore b/scripts/.gitignore deleted file mode 100644 index c5ec4a4cb..000000000 --- a/scripts/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Python -__pycache__/ -*.pyc - -# ODL Signer -.sign-artifacts -gpg-signatures diff --git a/scripts/check-unicode.sh b/scripts/check-unicode.sh deleted file mode 100755 index 931c99fac..000000000 --- a/scripts/check-unicode.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# @License EPL-1.0 -############################################################################## -# Copyright (c) 2015 The Linux Foundation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Thanh Ha (The Linux Foundation) - Initial implementation -############################################################################## - -directory=${1:-"."} - -echo "Scanning $directory" -if LC_ALL=C grep -r '[^[:print:][:space:]]' "$directory"; then - echo "Found files containing non-ascii characters." - exit 1 -fi - -echo "All files are ASCII only" -