diff options
| -rw-r--r--[-rwxr-xr-x] | Sandbox_Setup.md | 0 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg | 6 | ||||
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 105 | ||||
| m--------- | jjb/global-jjb | 0 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 6 | ||||
| -rw-r--r-- | scripts/.gitignore | 7 | ||||
| -rwxr-xr-x | scripts/check-unicode.sh | 25 |
7 files changed, 6 insertions, 143 deletions
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 42ed60897..42ed60897 100755..100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg new file mode 100644 index 000000000..1c76a4928 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -0,0 +1,6 @@ +IMAGE_NAME=Ubuntu 16.04 - docker - 20180101-1003 +LABELS=queue-docker-4c-4g +HARDWARE_ID=v2-highcpu-4 +INSTANCE_CAP=1 +NUM_EXECUTORS=4 +RETENTION_TIME=240 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-jjb b/jjb/global-jjb -Subproject 38f7e0e5a63228585159892b4a48468d110093e +Subproject 5ca1149a99351cc571d21b315e4acecae6b109b 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 @@ -5,12 +5,6 @@ # BUILDERS - builder: - name: ci-management-check-unicode - builders: - - shell: | - $WORKSPACE/scripts/check-unicode.sh jjb/ - -- builder: name: provide-maven-settings builders: - config-file-provider: 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 <http://spdx.org/licenses/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" - |