summaryrefslogtreecommitdiffstats
path: root/jjb/ci-management
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2018-04-03 12:51:26 -0700
committerAndrew Grimberg <agrimberg@linuxfoundation.org>2018-04-03 12:51:26 -0700
commite2f9ab7e36746f7908675f991585c148bdf6cb5d (patch)
tree96fd2545486c563f2c3324c8f7eb84d427713409 /jjb/ci-management
parent823e5fe32d5b6f0196f146d02b674878b7821a92 (diff)
Remove references to zuul and nodepool
FD.io has not been using zuul or nodepool for over a year. There is no reason to be keeping the templates or job scripts around if they aren't being used. Change-Id: Id35308209306b5dca9092df3599325a6d0e5e370 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/ci-management')
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml112
-rw-r--r--jjb/ci-management/include-raw-merge-nodepool.sh19
-rw-r--r--jjb/ci-management/include-raw-merge-zuul.sh16
-rw-r--r--jjb/ci-management/include-raw-test-nodepool.sh6
-rw-r--r--jjb/ci-management/include-raw-test-zuul.sh17
5 files changed, 0 insertions, 170 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index 6625a301d..acd8ae868 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -102,118 +102,6 @@
maven-version: 'mvn33-new'
- job-template:
- name: ci-management-verify-zuul
-
- project-type: freestyle
- node: jjb
- concurrent: true
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
-
- scm:
- - zuul-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: '$ZUUL_REF'
- commit: '$ZUUL_COMMIT'
-
- wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
-
- builders:
- - shell:
- !include-raw-escape: include-raw-test-zuul.sh
-
-- job-template:
- name: ci-management-merge-zuul
-
- project-type: freestyle
- node: jjb
-
- logrotate:
- daysToKeep: 30
- numToKeep: 40
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
-
- scm:
- - zuul-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: ''
- commit: 'origin/$ZUUL_BRANCH'
-
- wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
-
- builders:
- - shell:
- !include-raw-escape: include-raw-test-zuul.sh
- - shell:
- !include-raw-escape: include-raw-merge-zuul.sh
-
-- job-template:
- name: ci-management-verify-nodepool
-
- project-type: freestyle
- node: np
- concurrent: true
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
-
- scm:
- - zuul-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: '$ZUUL_REF'
- commit: '$ZUUL_COMMIT'
-
- wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
-
- builders:
- - shell:
- !include-raw-escape: include-raw-test-nodepool.sh
-
-- job-template:
- name: ci-management-merge-nodepool
-
- project-type: freestyle
- node: np
-
- logrotate:
- daysToKeep: 30
- numToKeep: 40
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
-
- scm:
- - zuul-trigger-scm:
- credentials-id: 'jenkins-gerrit-credentials'
- refspec: ''
- commit: 'origin/$ZUUL_BRANCH'
-
- wrappers:
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
-
- builders:
- - shell:
- !include-raw-escape: include-raw-test-nodepool.sh
- - shell:
- !include-raw-escape: include-raw-merge-nodepool.sh
-
-
-
-- job-template:
name: 'ci-management-verify-packer'
project-type: freestyle
node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/ci-management/include-raw-merge-nodepool.sh b/jjb/ci-management/include-raw-merge-nodepool.sh
deleted file mode 100644
index 661e382e6..000000000
--- a/jjb/ci-management/include-raw-merge-nodepool.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# vi: sw=4 ts=4 sts=4 et :
-
-cd "${WORKSPACE}/nodepool"
-/usr/bin/diff nodepool.yaml /etc/nodepool/nodepool.yaml
-RET=$?
-if [ "${RET}" -ne '0' ]
-then
- echo
- echo 'Nodepool layouts differ, updating layout'
- echo
- /usr/bin/sudo /usr/bin/cp nodepool.yaml /etc/nodepool/nodepool.yaml
-else
- echo
- echo 'No differences in layout, not updating'
- echo
-fi
-
diff --git a/jjb/ci-management/include-raw-merge-zuul.sh b/jjb/ci-management/include-raw-merge-zuul.sh
deleted file mode 100644
index 57456f6b9..000000000
--- a/jjb/ci-management/include-raw-merge-zuul.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# vi: sw=4 ts=4 sts=4 et :
-
-cd "${WORKSPACE}/zuul"
-/usr/bin/diff layout.yaml /etc/zuul/layout.yaml
-RET=$?
-if [ "${RET}" -ne '0' ]
-then
- echo
- echo 'Zuul layouts differ, updating layout and reloading zuul'
- echo
- /usr/bin/sudo /usr/bin/cp layout.yaml /etc/zuul/layout.yaml
- /usr/bin/sudo /usr/bin/systemctl reload zuul
-fi
-
diff --git a/jjb/ci-management/include-raw-test-nodepool.sh b/jjb/ci-management/include-raw-test-nodepool.sh
deleted file mode 100644
index b4a949d8c..000000000
--- a/jjb/ci-management/include-raw-test-nodepool.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-# activate the nodepool virtual env
-source /opt/venv-nodepool/bin/activate
-
-nodepool -c ${WORKSPACE}/nodepool/nodepool.yaml config-validate
diff --git a/jjb/ci-management/include-raw-test-zuul.sh b/jjb/ci-management/include-raw-test-zuul.sh
deleted file mode 100644
index 24e0a8f8f..000000000
--- a/jjb/ci-management/include-raw-test-zuul.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-# activate the zuul virtual env on system that has tox installed
-source /opt/venv-zuul/bin/activate
-
-rm -rf .test
-mkdir .test
-cd .test
-
-# track the upstream zuul HEAD, this may be honestly a little risky
-# but the validations shouldn't fail often due to upstream changes
-git clone https://github.com/openstack-infra/zuul --depth 1
-cd zuul
-
-# calling tox will actually build out a new virtualenv and use that
-# which is honestly a little silly... but whatever
-tox -e validate-layout $WORKSPACE/zuul/layout.yaml