From: Thanh Ha Date: Wed, 12 Aug 2020 20:27:15 +0000 (-0400) Subject: Remove gbp csit jobs and packer images X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=453222f7ba71ec9e7d44a6981a3c1883b586184f Remove gbp csit jobs and packer images These jobs are all disabled and the project has been inactive since end of 2019. Let's remove the CSIT jobs which in turn allows us to remove the package images that are unmaintained. Issue: RELENG-154 Change-Id: Ic17d656755670f7b21eb2ac7353aa85e64690743 Signed-off-by: Thanh Ha --- diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml deleted file mode 100644 index 264a3a018..000000000 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: groupbasedpolicy-csit-openstack-integration - jobs: - - inttest-csit-openstack-custom - - # The project name - project: "groupbasedpolicy" - disable-job: true - - topology: - - 1node: - openstack_system_count: 1 - odl_system_count: 1 - enable-haproxy: "no" - - testplan: "{project}-{topology}-openstack.txt" - - # The project name - functionality: "openstack" - - stream: - - silicon: - branch: "master" - jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - - sodium: - branch: "stable/sodium" - - openstack: - - queens: - openstack-branch: "stable/queens" - odl-ml2-branch: "stable/queens" - - public-bridge: "br-int" - - enable-openstack-plugins: "networking-odl" - - security-group-mode: "none" diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml deleted file mode 100644 index bf6305a08..000000000 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- project: - name: groupbasedpolicy-csit-3node - jobs: - - inttest-csit-1node - - # The project name - project: "groupbasedpolicy" - disable-job: true - - # The functionality under test - functionality: "3-node" - - # Project branches - stream: - - silicon: - branch: "master" - jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - - sodium: - branch: "stable/sodium" - - install: - - all: - scope: "all" - - # 3 Ubuntu VMs in JCloud configuration - tools_system_count: 3 - tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431 - - # Features to install - install-features: "odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all" - - # Robot custom options - robot-options: "" diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml deleted file mode 100644 index 2da966ce3..000000000 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- project: - name: groupbasedpolicy-csit-6node - jobs: - - inttest-csit-1node - - # The project name - project: "groupbasedpolicy" - disable-job: true - - # The functionality under test - functionality: "6node" - - # Project branches - stream: - - silicon: - branch: "master" - jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - - sodium: - branch: "stable/sodium" - - install: - - all: - scope: "all" - - # 6 Ubuntu VMs in JCloud configuration - tools_system_count: 6 - tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431 - - # Features to install - install-features: > - odl-groupbasedpolicy-ofoverlay, - odl-groupbasedpolicy-ui, - odl-restconf-all - - # Robot custom options - robot-options: "" diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml deleted file mode 100644 index 76f071627..000000000 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: groupbasedpolicy-csit-clustering - jobs: - - inttest-csit-3node - - # The project name - project: "groupbasedpolicy" - disable-job: true - - # The functionality under test - functionality: "clustering" - - # Project branches - stream: - - silicon: - branch: "master" - jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - - sodium: - branch: "stable/sodium" - - install: - - all: - scope: "all" - - # Features to install - install-features: > - odl-groupbasedpolicy-ofoverlay, - odl-groupbasedpolicy-ui, - odl-restconf-all - - # Robot custom options - robot-options: "" diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml deleted file mode 100644 index 2ac02f62f..000000000 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: groupbasedpolicy-csit-sxp - jobs: - - inttest-csit-1node - # The project name - project: "groupbasedpolicy" - disable-job: true - - # The functionality under test - functionality: "sxp" - - # Project branches - stream: - - silicon: - branch: "master" - jre: "openjdk11" - - aluminium: - branch: "stable/aluminium" - jre: "openjdk11" - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - - sodium: - branch: "stable/sodium" - - install: - - only: - scope: "only" - - # Mininet configuration (TOOLS) - tools_system_count: 2 - - # Features to install - install-features: > - odl-restconf, - odl-groupbasedpolicy-sxp-ise-adapter, - odl-groupbasedpolicy-ne-location-provider, - odl-groupbasedpolicy-ios-xe, - odl-sfc-ios-xe-renderer, - odl-sxp-controller - - # Robot custom options - robot-options: "" diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml index e98c1e681..4f01a14db 100644 --- a/jjb/releng-packer-jobs.yaml +++ b/jjb/releng-packer-jobs.yaml @@ -121,27 +121,6 @@ templates: docker update-cloud-image: true -- project: - name: packer-gbp-jobs - jobs: - - gerrit-packer-merge - - project: releng/builder - project-name: builder - branch: master - archive-artifacts: "**/*.log" - - build-node: centos7-builder-2c-1g - build-timeout: 90 - cron: "00 H 1 * *" - - platforms: - - ubuntu-16.04 - - ubuntu-18.04: - disable-job: true - templates: gbp - update-cloud-image: true - - project: name: packer-mininet-ovs-2.5-jobs jobs: diff --git a/packer/provision/gbp.sh b/packer/provision/gbp.sh deleted file mode 100644 index 95ba70c9b..000000000 --- a/packer/provision/gbp.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -# vim: sw=4 ts=4 sts=4 et tw=72 : - -# force any errors to cause the script and job to end in failure -set -xeu -o pipefail - -# Ensure that necessary variables are set to enable noninteractive mode in -# commands. -export DEBIAN_FRONTEND=noninteractive - -# additional kernel packages required for docker to fix -# aufs failed: driver not supported -echo "---> Installing Additional kernel packages required for docker" -apt-get update -apt-get install "linux-image-extra-$(uname -r)" linux-image-extra-virtual -modprobe aufs - -# Install and configure docker. Use puppetlabs docker which supports -# Ubuntu 16.04 -puppet module install puppetlabs-docker_platform --version 2.2.1 - -# do the package install via puppet so that we know it actually installs -# properly and it also makes it quieter but with better error reporting -echo "---> Installing Group Based Policy requirements" -puppet apply /tmp/packer/gbp_packages.pp - -# configure docker networking so that it does not conflict with LF internal networks -# configure docker daemon to listen on port 5555 enabling remote managment -# This has to happen before docker gets installed or things go sideways -# badly -cat < /etc/default/docker -# /etc/default/docker -DOCKER_OPTS='-H unix:///var/run/docker.sock -H tcp://0.0.0.0:5555 --bip=10.250.0.254/24' -EOL - -# docker -echo "---> Installing docker" -puppet apply /tmp/packer/docker_setup.pp - -echo "---> stopping docker" -puppet apply -e "service { 'docker': ensure => stopped }" - -echo "---> cleaning docker configs that break after snapshotting" -rm -f /var/lib/docker/repositories-aufs /etc/docker/key.json - -# OVS -echo "---> Installing ovs" -puppet module install puppetlabs-vcsrepo -puppet apply /tmp/packer/ovs_setup.pp - -pushd /root/ovs -DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary | \ - grep 'dpkg-deb: building package' -popd - -# Note this does not actually install OVS. Everytime we've tried to do -# that the snapshot system hangs on spin-up for some reason. As such the -# final installation will have to be left as a spin-up task - -# The following is what should be used in the spin-up task -# dpkg --install /root/openvswitch-datapath-dkms* && dpkg --install /root/openvswitch-{common,switch}* diff --git a/packer/provision/gbp_puppet/docker_setup.pp b/packer/provision/gbp_puppet/docker_setup.pp deleted file mode 100644 index 4a3a66e63..000000000 --- a/packer/provision/gbp_puppet/docker_setup.pp +++ /dev/null @@ -1,6 +0,0 @@ - -#include docker -class { 'docker': - tcp_bind => 'tcp://0.0.0.0:5555', - extra_parameters => '--bip=10.250.0.254/24', -} diff --git a/packer/provision/gbp_puppet/gbp_packages.pp b/packer/provision/gbp_puppet/gbp_packages.pp deleted file mode 100644 index 6d97a3392..000000000 --- a/packer/provision/gbp_puppet/gbp_packages.pp +++ /dev/null @@ -1,12 +0,0 @@ -package { [ - 'software-properties-common', - 'python-software-properties', - 'python-pip', - 'python-virtualenv', - 'git-core', - 'git', - 'curl', - 'bridge-utils', - 'python-ipaddr']: - ensure => present, -} diff --git a/packer/provision/gbp_puppet/ovs_setup.pp b/packer/provision/gbp_puppet/ovs_setup.pp deleted file mode 100644 index e475770ba..000000000 --- a/packer/provision/gbp_puppet/ovs_setup.pp +++ /dev/null @@ -1,30 +0,0 @@ -package { [ - 'build-essential', - 'fakeroot', - 'debhelper', - 'autoconf', - 'automake', - 'libssl-dev', - 'bzip2', - 'openssl', - 'graphviz', - 'python-all', - 'procps', - 'python-qt4', - 'python-zopeinterface', - 'python-twisted-conch', - 'libtool', - "linux-headers-${::releaseversion}", - 'dkms', - ]: - ensure => present, -} - -vcsrepo { '/root/ovs': - ensure => present, - provider => git, - source => 'https://github.com/pritesh/ovs.git', - revision => 'nsh-v8', -} - - diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json deleted file mode 100644 index 84ebbbe57..000000000 --- a/packer/templates/gbp.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "variables": { - "ansible_roles_path": ".galaxy", - "arch": "x86_64", - "base_image": null, - "cloud_network": null, - "cloud_user_data": null, - "cloud_region": "ca-ymq-1", - "cloud_availability_zone": "ca-ymq-2", - "vm_use_block_storage": "true", - "vm_volume_size": "20", - "vm_image_disk_format": "", - "distro": null, - "flavor": "v2-highcpu-1", - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - gbp - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", - "instance_name": "{{user `distro`}}-gbp-{{uuid}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "region": "{{user `cloud_region`}}", - "availability_zone": "{{user `cloud_availability_zone`}}", - "networks": ["{{user `cloud_network`}}"], - "user_data_file": "{{user `cloud_user_data`}}", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "{{user `flavor`}}", - "metadata": { - "ci_managed": "yes" - }, - "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", - "volume_size": "{{user `vm_volume_size`}}", - "image_disk_format": "{{user `vm_image_disk_format`}}" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": ["mkdir -p /tmp/packer"] - }, - { - "type": "file", - "source": "provision/gbp_puppet/", - "destination": "/tmp/packer" - }, - { - "type": "shell", - "scripts": [ - "provision/baseline.sh", - "provision/gbp.sh", - "provision/system_reseal_local_env.sh", - "provision/system_reseal.sh" - ], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - } - ] -}