summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/cloud.cfg2
-rw-r--r--jenkins-config/global-vars-sandbox.sh1
-rw-r--r--jenkins.ini.example11
-rw-r--r--jjb/ci-management/ci-management.yaml105
m---------jjb/global-jjb0
-rw-r--r--jjb/global-macros.yaml6
-rw-r--r--scripts/.gitignore7
-rwxr-xr-xscripts/check-unicode.sh25
9 files changed, 8 insertions, 151 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
index ba781783f..e034fca44 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20171102-0130
+IMAGE_NAME=ZZCI - CentOS 7 - redis - 20171102-0130
LABELS=centos7-redis-4c-4g
HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 37c4bcaf0..7872de343 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -8,7 +8,7 @@ CLOUD_ZONE=ca-ymq-1
IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002
HARDWARE_ID=v1-standard-1
NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf
-USER_DATA_ID=jenkins-init-system
+USER_DATA_ID=jenkins-init-script
INSTANCE_CAP=75
SANDBOX_CAP=4
FLOATING_IP_POOL=
diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index b590e09fc..589dc6e30 100644
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -11,5 +11,6 @@ LOGS_SERVER=https://logs.onap.org
NEXUS_URL=https://nexus.onap.org
NEXUSPROXY=https://nexus.onap.org
REGISTRY_PORTS=10001 10002 10003 10004
+SIGUL_KEY=onap-test
SILO=sandbox
SONAR_URL=https://sonar.onap.org
diff --git a/jenkins.ini.example b/jenkins.ini.example
index 959f06bb1..9dcf35767 100644
--- a/jenkins.ini.example
+++ b/jenkins.ini.example
@@ -1,13 +1,12 @@
[job_builder]
ignore_cache=True
keep_descriptions=False
-include_path=.:scripts:~/git/
+include_path=.
recursive=True
+retain_anchors=True
[jenkins]
+user=#username#
+password=#api_token#
+url=https://jenkins.onap.org/sandbox
query_plugins_info=False
-#user=jenkins
-#password=1234567890abcdef1234567890abcdef
-url=http://localhost:8080
-##### This is deprecated, use job_builder section instead
-#ignore_cache=True
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 f58aa56acc44a8eb7498af10e5d229e1690e58b
+Subproject 38f7e0e5a63228585159892b4a48468d110093e
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"
-