diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg
deleted file mode 100644
index c581999f..00000000
--- a/centos_build_layer.cfg
+++ /dev/null
@@ -1 +0,0 @@
-flock
diff --git a/centos_dev_wheels.inc b/centos_dev_wheels.inc
deleted file mode 100644
index 9ad698d1..00000000
--- a/centos_dev_wheels.inc
+++ /dev/null
@@ -1 +0,0 @@
-cgcs-patch-wheels
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
deleted file mode 100644
index d887c222..00000000
--- a/centos_iso_image.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# List of packages to be included/installed in ISO
-# If these have dependencies, they will be pulled in automatically
-#
-
-
-# cgcs-patch
-cgcs-patch
-cgcs-patch-controller
-cgcs-patch-agent
-
-# patch-alarm
-patch-alarm
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
deleted file mode 100644
index ec3f451b..00000000
--- a/centos_pkg_dirs
+++ /dev/null
@@ -1,13 +0,0 @@
-cgcs-patch
-patch-alarm
-patch-scripts/EXAMPLE_0001
-patch-scripts/EXAMPLE_0002
-patch-scripts/EXAMPLE_DC
-patch-scripts/EXAMPLE_RR
-patch-scripts/EXAMPLE_MTCE
-patch-scripts/EXAMPLE_VIM
-patch-scripts/EXAMPLE_SYSINV
-patch-scripts/EXAMPLE_SERVICE
-patch-scripts/EXAMPLE_KUBELET
-patch-scripts/EXAMPLE_DOCKER
-enable-dev-patch
diff --git a/centos_stable_wheels.inc b/centos_stable_wheels.inc
deleted file mode 100644
index 9ad698d1..00000000
--- a/centos_stable_wheels.inc
+++ /dev/null
@@ -1 +0,0 @@
-cgcs-patch-wheels
diff --git a/cgcs-patch/centos/build_srpm.data b/cgcs-patch/centos/build_srpm.data
deleted file mode 100644
index 9568ac81..00000000
--- a/cgcs-patch/centos/build_srpm.data
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC_DIR=.
-EXCLUDE_LIST_FROM_TAR="centos \
-    cgcs-patch/.tox cgcs-patch/.coverage cgcs-patch/.stestr cgcs-patch/cover \
-    cgcs-patch/cgcs_make_patch cgcs-patch/cgcs_patch_id"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/cgcs-patch/centos/cgcs-patch.spec b/cgcs-patch/centos/cgcs-patch.spec
deleted file mode 100644
index 2af9e44e..00000000
--- a/cgcs-patch/centos/cgcs-patch.spec
+++ /dev/null
@@ -1,192 +0,0 @@
-Summary: StarlingX Platform Patching
-Name: cgcs-patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-Source0: %{name}-%{version}.tar.gz
-
-BuildRequires: python-setuptools
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-BuildRequires: systemd-units
-BuildRequires: systemd-devel
-BuildRequires: python-lxml
-Requires: python-devel
-Requires: python-crypto
-Requires: python-pycryptodomex
-Requires: dnf
-Requires: python-dnf
-Requires: /bin/bash
-
-%description
-StarlingX Platform Patching
-
-%define debug_package %{nil}
-
-%prep
-%setup -n %{name}-%{version}/%{name}
-
-%build
-%{__python} setup.py build
-%py2_build_wheel
-
-%install
-%{__python} setup.py install --root=$RPM_BUILD_ROOT \
-                             --install-lib=%{python2_sitearch} \
-                             --prefix=/usr \
-                             --install-data=/usr/share \
-                             --single-version-externally-managed
-mkdir -p $RPM_BUILD_ROOT/wheels
-install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
-
-install -m 755 -d %{buildroot}%{_sbindir}
-install -m 755 -d %{buildroot}%{_sysconfdir}/bash_completion.d
-install -m 755 -d %{buildroot}%{_sysconfdir}/goenabled.d
-install -m 755 -d %{buildroot}%{_sysconfdir}/init.d
-install -m 755 -d %{buildroot}%{_sysconfdir}/logrotate.d
-install -m 755 -d %{buildroot}%{_sysconfdir}/patching
-install -m 700 -d %{buildroot}%{_sysconfdir}/patching/patch-scripts
-install -m 755 -d %{buildroot}%{_sysconfdir}/pmon.d
-install -m 755 -d %{buildroot}%{_unitdir}
-
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-agent \
-    %{buildroot}%{_sbindir}/sw-patch-agent
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-daemon \
-    %{buildroot}%{_sbindir}/sw-patch-controller-daemon
-install -m 555 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch \
-    %{buildroot}%{_sbindir}/sw-patch
-
-install -m 555 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/rpm-audit \
-    %{buildroot}%{_sbindir}/rpm-audit
-
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-daemon-init.sh \
-    %{buildroot}%{_sysconfdir}/init.d/sw-patch-controller-daemon
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-agent-init.sh \
-    %{buildroot}%{_sysconfdir}/init.d/sw-patch-agent
-
-install -m 600 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patching.conf \
-    %{buildroot}%{_sysconfdir}/patching/patching.conf
-install -m 644 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/policy.json \
-    %{buildroot}%{_sysconfdir}/patching/policy.json
-
-install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/pmon-sw-patch-controller-daemon.conf \
-    %{buildroot}%{_sysconfdir}/pmon.d/sw-patch-controller-daemon.conf
-install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/pmon-sw-patch-agent.conf \
-    %{buildroot}%{_sysconfdir}/pmon.d/sw-patch-agent.conf
-
-install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/*.service %{buildroot}%{_unitdir}
-
-install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch.completion %{buildroot}%{_sysconfdir}/bash_completion.d/sw-patch
-
-install -m 400 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patch-functions \
-    %{buildroot}%{_sysconfdir}/patching/patch-functions
-
-install -D -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patch-tmpdirs.conf \
-    %{buildroot}%{_tmpfilesdir}/patch-tmpdirs.conf
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/run-patch-scripts \
-    %{buildroot}%{_sbindir}/run-patch-scripts
-
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-daemon-restart \
-    %{buildroot}%{_sbindir}/sw-patch-controller-daemon-restart
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-agent-restart \
-    %{buildroot}%{_sbindir}/sw-patch-agent-restart
-
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-init.sh \
-    %{buildroot}%{_sysconfdir}/init.d/sw-patch
-install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-init.sh \
-    %{buildroot}%{_sysconfdir}/init.d/sw-patch-controller
-
-install -m 555 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patch_check_goenabled.sh \
-    %{buildroot}%{_sysconfdir}/goenabled.d/patch_check_goenabled.sh
-
-install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patching.logrotate \
-    %{buildroot}%{_sysconfdir}/logrotate.d/patching
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%package -n cgcs-patch-controller
-Summary: StarlingX Platform Patching
-Group: base
-Requires: /usr/bin/env
-Requires: /bin/sh
-Requires: requests-toolbelt
-Requires: createrepo
-Requires(post): /usr/bin/env
-Requires(post): /bin/sh
-
-%description -n cgcs-patch-controller
-StarlingX Platform Patching
-
-%post -n cgcs-patch-controller
-/usr/bin/systemctl enable sw-patch-controller.service
-/usr/bin/systemctl enable sw-patch-controller-daemon.service
-
-
-%package -n cgcs-patch-agent
-Summary: StarlingX Platform Patching
-Group: base
-Requires: /usr/bin/env
-Requires: /bin/sh
-Requires(post): /usr/bin/env
-Requires(post): /bin/sh
-
-%description -n cgcs-patch-agent
-StarlingX Platform Patching
-
-%post -n cgcs-patch-agent
-/usr/bin/systemctl enable sw-patch-agent.service
-
-%post
-/usr/bin/systemctl enable sw-patch.service
-
-%files
-%license LICENSE
-%defattr(-,root,root,-)
-%{python2_sitearch}/cgcs_patch
-%{python2_sitearch}/cgcs_patch-*.egg-info
-%{_sbindir}/rpm-audit
-%config(noreplace) %{_sysconfdir}/patching/policy.json
-%config(noreplace) %{_sysconfdir}/patching/patching.conf
-%dir %{_sysconfdir}/patching/patch-scripts
-%{_sysconfdir}/patching/patch-functions
-%{_tmpfilesdir}/patch-tmpdirs.conf
-%{_sbindir}/run-patch-scripts
-%{_sysconfdir}/init.d/sw-patch
-%{_unitdir}/sw-patch.service
-%{_sysconfdir}/goenabled.d/patch_check_goenabled.sh
-%{_sysconfdir}/logrotate.d/patching
-
-%files -n cgcs-patch-controller
-%defattr(-,root,root,-)
-%{_sbindir}/sw-patch
-%{_sbindir}/sw-patch-controller-daemon
-%{_sbindir}/sw-patch-controller-daemon-restart
-%{_sbindir}/upgrade-start-pkg-extract
-%{_sysconfdir}/pmon.d/sw-patch-controller-daemon.conf
-%{_sysconfdir}/init.d/sw-patch-controller-daemon
-%{_unitdir}/sw-patch-controller-daemon.service
-%{_sysconfdir}/bash_completion.d/sw-patch
-%{_sysconfdir}/init.d/sw-patch-controller
-%{_unitdir}/sw-patch-controller.service
-
-%files -n cgcs-patch-agent
-%defattr(-,root,root,-)
-%{_sbindir}/sw-patch-agent
-%{_sbindir}/sw-patch-agent-restart
-%{_sysconfdir}/pmon.d/sw-patch-agent.conf
-%{_sysconfdir}/init.d/sw-patch-agent
-%{_unitdir}/sw-patch-agent.service
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/wheels/*
diff --git a/enable-dev-patch/centos/build_srpm.data b/enable-dev-patch/centos/build_srpm.data
deleted file mode 100644
index 43e6617e..00000000
--- a/enable-dev-patch/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-TIS_PATCH_VER=PKG_GITREVCOUNT
-COPY_LIST="enable-dev-patch/*"
diff --git a/enable-dev-patch/centos/enable-dev-patch.spec b/enable-dev-patch/centos/enable-dev-patch.spec
deleted file mode 100644
index 1201feec..00000000
--- a/enable-dev-patch/centos/enable-dev-patch.spec
+++ /dev/null
@@ -1,28 +0,0 @@
-Summary: Enable installation of developer patches
-Name: enable-dev-patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-Source0: dev_certificate_enable.bin
-
-%description
-Enables the installation of StarlingX patches signed by developers
-
-%prep
-
-%build
-
-%install
-    install -m 755 -d %{buildroot}%{_sysconfdir}/pki/wrs
-    install -m 444 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/wrs/dev_certificate_enable.bin
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_sysconfdir}/pki/wrs/dev_certificate_enable.bin
-
diff --git a/patch-alarm/centos/build_srpm.data b/patch-alarm/centos/build_srpm.data
deleted file mode 100644
index aa8063cb..00000000
--- a/patch-alarm/centos/build_srpm.data
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC_DIR=.
-EXCLUDE_LIST_FROM_TAR="centos patch-alarm/.tox patch-alarm/.coverage patch-alarm/.stestr patch-alarm/cover"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-alarm/centos/patch-alarm.spec b/patch-alarm/centos/patch-alarm.spec
deleted file mode 100644
index 8c5f7703..00000000
--- a/patch-alarm/centos/patch-alarm.spec
+++ /dev/null
@@ -1,66 +0,0 @@
-Summary: Patch alarm management
-Name: patch-alarm
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-Source0: %{name}-%{version}.tar.gz
-
-%define debug_package %{nil}
-
-BuildRequires: python-setuptools
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-Requires: python-devel
-Requires: /bin/bash
-
-%description
-StarlingX Platform Patching Alarm Manager
-
-%prep
-%setup -n %{name}-%{version}/%{name}
-
-%build
-%{__python} setup.py build
-%py2_build_wheel
-
-%install
-%{__python} setup.py install --root=$RPM_BUILD_ROOT \
-                             --install-lib=%{python2_sitearch} \
-                             --prefix=/usr \
-                             --install-data=/usr/share \
-                             --single-version-externally-managed
-mkdir -p $RPM_BUILD_ROOT/wheels
-install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
-
-install -m 755 -d %{buildroot}%{_bindir}
-install -m 755 -d %{buildroot}%{_sysconfdir}/init.d
-
-install -m 700 ${RPM_BUILD_DIR}/%{name}-%{version}/scripts/bin/patch-alarm-manager \
-        %{buildroot}%{_bindir}/patch-alarm-manager
-
-install -m 700 ${RPM_BUILD_DIR}/%{name}-%{version}/scripts/init.d/patch-alarm-manager \
-        %{buildroot}%{_sysconfdir}/init.d/patch-alarm-manager
-
-%clean
-rm -rf $RPM_BUILD_ROOT 
-
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{python2_sitearch}/patch_alarm
-%{python2_sitearch}/patch_alarm-*.egg-info
-"%{_bindir}/patch-alarm-manager"
-"%{_sysconfdir}/init.d/patch-alarm-manager"
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/wheels/*
diff --git a/patch-scripts/EXAMPLE_0001/centos/EXAMPLE_0001.spec b/patch-scripts/EXAMPLE_0001/centos/EXAMPLE_0001.spec
deleted file mode 100644
index 9dbd7dae..00000000
--- a/patch-scripts/EXAMPLE_0001/centos/EXAMPLE_0001.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: EXAMPLE_0001
-Summary: TIS In-Service Patch Scripts Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: example-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/EXAMPLE_0001/centos/build_srpm.data b/patch-scripts/EXAMPLE_0001/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/EXAMPLE_0001/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_0002/centos/EXAMPLE_0002.spec b/patch-scripts/EXAMPLE_0002/centos/EXAMPLE_0002.spec
deleted file mode 100644
index 94edab8b..00000000
--- a/patch-scripts/EXAMPLE_0002/centos/EXAMPLE_0002.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: EXAMPLE_0002
-Summary: TIS In-Service Patch Scripts Example, Patching Daemons
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: example-cgcs-patch-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/EXAMPLE_0002/centos/build_srpm.data b/patch-scripts/EXAMPLE_0002/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/EXAMPLE_0002/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_DC/centos/EXAMPLE_DC.spec b/patch-scripts/EXAMPLE_DC/centos/EXAMPLE_DC.spec
deleted file mode 100644
index 020783e2..00000000
--- a/patch-scripts/EXAMPLE_DC/centos/EXAMPLE_DC.spec
+++ /dev/null
@@ -1,28 +0,0 @@
-Name: EXAMPLE_DC
-Summary: StarlingX In-Service DistCloud Patch Script Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: distcloud-restart-example
-
-BuildArch: noarch
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
diff --git a/patch-scripts/EXAMPLE_DC/centos/build_srpm.data b/patch-scripts/EXAMPLE_DC/centos/build_srpm.data
deleted file mode 100644
index c183737e..00000000
--- a/patch-scripts/EXAMPLE_DC/centos/build_srpm.data
+++ /dev/null
@@ -1,3 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
-
diff --git a/patch-scripts/EXAMPLE_DOCKER/centos/EXAMPLE_DOCKER.spec b/patch-scripts/EXAMPLE_DOCKER/centos/EXAMPLE_DOCKER.spec
deleted file mode 100644
index a74c7430..00000000
--- a/patch-scripts/EXAMPLE_DOCKER/centos/EXAMPLE_DOCKER.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: EXAMPLE_DOCKER
-Summary: StarlingX In-Service dockerd Patch Script Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: windriver
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: dockerd-process-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/EXAMPLE_DOCKER/centos/build_srpm.data b/patch-scripts/EXAMPLE_DOCKER/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/EXAMPLE_DOCKER/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_KUBELET/centos/EXAMPLE_KUBELET.spec b/patch-scripts/EXAMPLE_KUBELET/centos/EXAMPLE_KUBELET.spec
deleted file mode 100644
index 3aa9527b..00000000
--- a/patch-scripts/EXAMPLE_KUBELET/centos/EXAMPLE_KUBELET.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name: EXAMPLE_KUBELET
-Summary: StarlingX In-Service kubelet Patch Script Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: kubelet-restart-example
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
diff --git a/patch-scripts/EXAMPLE_KUBELET/centos/build_srpm.data b/patch-scripts/EXAMPLE_KUBELET/centos/build_srpm.data
deleted file mode 100644
index 0a4d919c..00000000
--- a/patch-scripts/EXAMPLE_KUBELET/centos/build_srpm.data
+++ /dev/null
@@ -1,3 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=1
-
diff --git a/patch-scripts/EXAMPLE_MTCE/centos/EXAMPLE_MTCE.spec b/patch-scripts/EXAMPLE_MTCE/centos/EXAMPLE_MTCE.spec
deleted file mode 100644
index 6702a2c5..00000000
--- a/patch-scripts/EXAMPLE_MTCE/centos/EXAMPLE_MTCE.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: EXAMPLE_MTCE
-Summary: TIS In-Service Maintenance Patch Script Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: mtce-restart-example
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data b/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_RR/centos/EXAMPLE_RR.spec b/patch-scripts/EXAMPLE_RR/centos/EXAMPLE_RR.spec
deleted file mode 100644
index e4d4afd0..00000000
--- a/patch-scripts/EXAMPLE_RR/centos/EXAMPLE_RR.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: EXAMPLE_RR
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/EXAMPLE_RR/centos/build_srpm.data b/patch-scripts/EXAMPLE_RR/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/EXAMPLE_RR/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_SERVICE/centos/EXAMPLE_SERVICE.spec b/patch-scripts/EXAMPLE_SERVICE/centos/EXAMPLE_SERVICE.spec
deleted file mode 100644
index 3b63b0cc..00000000
--- a/patch-scripts/EXAMPLE_SERVICE/centos/EXAMPLE_SERVICE.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: EXAMPLE_SERVICE
-Summary: TIS In-Service Patch Scripts Example that supports systemd reload
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: windriver
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: service-process-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data b/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_SYSINV/centos/EXAMPLE_SYSINV.spec b/patch-scripts/EXAMPLE_SYSINV/centos/EXAMPLE_SYSINV.spec
deleted file mode 100644
index 1e8909ae..00000000
--- a/patch-scripts/EXAMPLE_SYSINV/centos/EXAMPLE_SYSINV.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name: EXAMPLE_SYSINV
-Summary: TIS In-Service SysInv Patch Script Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: sysinv-restart-example
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
diff --git a/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data b/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data
deleted file mode 100644
index c183737e..00000000
--- a/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data
+++ /dev/null
@@ -1,3 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
-
diff --git a/patch-scripts/EXAMPLE_VIM/centos/EXAMPLE_VIM.spec b/patch-scripts/EXAMPLE_VIM/centos/EXAMPLE_VIM.spec
deleted file mode 100644
index c8922120..00000000
--- a/patch-scripts/EXAMPLE_VIM/centos/EXAMPLE_VIM.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name: EXAMPLE_VIM
-Summary: TIS In-Service Vim Patch Script Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: vim-restart-example
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
diff --git a/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data b/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data
deleted file mode 100644
index 1bc971c3..00000000
--- a/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT+2
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/SUITE_B_KERNEL.spec b/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/SUITE_B_KERNEL.spec
deleted file mode 100644
index c8e7331e..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/SUITE_B_KERNEL.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: SUITE_B_KERNEL
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/SUITE_B_PATCH_A.spec b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/SUITE_B_PATCH_A.spec
deleted file mode 100644
index 46990507..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/SUITE_B_PATCH_A.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: SUITE_B_PATCH_A
-Summary: TIS In-Service Patch Scripts
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-script
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/SUITE_B_PATCH_B.spec b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/SUITE_B_PATCH_B.spec
deleted file mode 100644
index b048c562..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/SUITE_B_PATCH_B.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: SUITE_B_PATCH_B
-Summary: TIS In-Service Patch Scripts
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-script
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/SUITE_B_PATCH_C.spec b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/SUITE_B_PATCH_C.spec
deleted file mode 100644
index bf2287c1..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/SUITE_B_PATCH_C.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: SUITE_B_PATCH_C
-Summary: TIS In-Service Patch Scripts
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-script
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/SUITE_B_PATCH_D.spec b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/SUITE_B_PATCH_D.spec
deleted file mode 100644
index 8b6681b2..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/SUITE_B_PATCH_D.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: SUITE_B_PATCH_D
-Summary: TIS In-Service Patch Scripts
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-script
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/SUITE_B_PATCH_E.spec b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/SUITE_B_PATCH_E.spec
deleted file mode 100644
index ed3272fb..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/SUITE_B_PATCH_E.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: SUITE_B_PATCH_E
-Summary: TIS In-Service Patch Scripts
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-script
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/SUITE_B_PATCH_F.spec b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/SUITE_B_PATCH_F.spec
deleted file mode 100644
index 60765c95..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/SUITE_B_PATCH_F.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: SUITE_B_PATCH_F
-Summary: TIS In-Service Patch Scripts
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-script
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/A/centos/A.spec b/patch-scripts/test-patches/A/centos/A.spec
deleted file mode 100644
index 647354d2..00000000
--- a/patch-scripts/test-patches/A/centos/A.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: A
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/A/centos/build_srpm.data b/patch-scripts/test-patches/A/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/A/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/B/centos/B.spec b/patch-scripts/test-patches/B/centos/B.spec
deleted file mode 100644
index f0401933..00000000
--- a/patch-scripts/test-patches/B/centos/B.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: B
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/B/centos/build_srpm.data b/patch-scripts/test-patches/B/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/B/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/C/centos/C.spec b/patch-scripts/test-patches/C/centos/C.spec
deleted file mode 100644
index 3a472237..00000000
--- a/patch-scripts/test-patches/C/centos/C.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: C
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/C/centos/build_srpm.data b/patch-scripts/test-patches/C/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/C/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_ALLNODES/centos/INSVC_ALLNODES.spec b/patch-scripts/test-patches/INSVC_ALLNODES/centos/INSVC_ALLNODES.spec
deleted file mode 100644
index 40ae07b8..00000000
--- a/patch-scripts/test-patches/INSVC_ALLNODES/centos/INSVC_ALLNODES.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: INSVC_ALLNODES
-Summary: TIS In-Service All Nodes Patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: allnodes-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_COMPUTE/centos/INSVC_COMPUTE.spec b/patch-scripts/test-patches/INSVC_COMPUTE/centos/INSVC_COMPUTE.spec
deleted file mode 100644
index 6e443cf5..00000000
--- a/patch-scripts/test-patches/INSVC_COMPUTE/centos/INSVC_COMPUTE.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: INSVC_COMPUTE
-Summary: TIS In-Service Compute Patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: compute-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_CONTROLLER/centos/INSVC_CONTROLLER.spec b/patch-scripts/test-patches/INSVC_CONTROLLER/centos/INSVC_CONTROLLER.spec
deleted file mode 100644
index b747b553..00000000
--- a/patch-scripts/test-patches/INSVC_CONTROLLER/centos/INSVC_CONTROLLER.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name: INSVC_CONTROLLER
-Summary: TIS In-Service Controller Patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: controller-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
diff --git a/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/INSVC_RESTART_FAILURE.spec b/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/INSVC_RESTART_FAILURE.spec
deleted file mode 100644
index a3f417ba..00000000
--- a/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/INSVC_RESTART_FAILURE.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: INSVC_RESTART_FAILURE
-Summary: TIS In-Service Restart Failure Patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: restart-failure
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_STORAGE/centos/INSVC_STORAGE.spec b/patch-scripts/test-patches/INSVC_STORAGE/centos/INSVC_STORAGE.spec
deleted file mode 100644
index e8179bbd..00000000
--- a/patch-scripts/test-patches/INSVC_STORAGE/centos/INSVC_STORAGE.spec
+++ /dev/null
@@ -1,27 +0,0 @@
-Name: INSVC_STORAGE
-Summary: TIS In-Service Storage Patch
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-Source0: storage-restart
-
-%install
-    install -Dp -m 700 %{S:0} %{buildroot}%{_patch_scripts}/%{name}
-
-%description
-%{summary}
-
-%files
-%defattr(-,root,root,-)
-%{_patch_scripts}/*
-
-%post
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
-%preun
-cp -f %{_patch_scripts}/%{name} %{_runtime_patch_scripts}/
-exit 0
-
diff --git a/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data
deleted file mode 100644
index 4e4d73ac..00000000
--- a/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="scripts/*"
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/LARGE/centos/LARGE.spec b/patch-scripts/test-patches/LARGE/centos/LARGE.spec
deleted file mode 100644
index d4b76cc3..00000000
--- a/patch-scripts/test-patches/LARGE/centos/LARGE.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: LARGE
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/LARGE/centos/build_srpm.data b/patch-scripts/test-patches/LARGE/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/LARGE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_ALLNODES/centos/RR_ALLNODES.spec b/patch-scripts/test-patches/RR_ALLNODES/centos/RR_ALLNODES.spec
deleted file mode 100644
index f9bfd6be..00000000
--- a/patch-scripts/test-patches/RR_ALLNODES/centos/RR_ALLNODES.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: RR_ALLNODES
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data b/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_COMPUTE/centos/RR_COMPUTE.spec b/patch-scripts/test-patches/RR_COMPUTE/centos/RR_COMPUTE.spec
deleted file mode 100644
index 2601c7c3..00000000
--- a/patch-scripts/test-patches/RR_COMPUTE/centos/RR_COMPUTE.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: RR_COMPUTE
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data b/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_CONTROLLER/centos/RR_CONTROLLER.spec b/patch-scripts/test-patches/RR_CONTROLLER/centos/RR_CONTROLLER.spec
deleted file mode 100644
index ae9d74ad..00000000
--- a/patch-scripts/test-patches/RR_CONTROLLER/centos/RR_CONTROLLER.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: RR_CONTROLLER
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data b/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_STORAGE/centos/RR_STORAGE.spec b/patch-scripts/test-patches/RR_STORAGE/centos/RR_STORAGE.spec
deleted file mode 100644
index 39d7bad1..00000000
--- a/patch-scripts/test-patches/RR_STORAGE/centos/RR_STORAGE.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: RR_STORAGE
-Summary: TIS Reboot-Required Patch RPM Example
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-
-%description
-%{summary}
-
-%files
-
-%post
-touch /var/run/node_is_patched_rr
-exit 0
-
-%preun
-touch /var/run/node_is_patched_rr
-exit 0
-
diff --git a/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data b/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data
deleted file mode 100644
index 9e516f7f..00000000
--- a/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=PKG_GITREVCOUNT