Clean up structure of OSS jobs

Change-Id: Ie35ce47be6ccb0fb6cb8c06f7fa55bdcd8eddfee
diff --git a/jenkins/client/job/docker/cis-collectors.yml b/jenkins/client/job/docker/oss/cis-collectors.yml
similarity index 100%
rename from jenkins/client/job/docker/cis-collectors.yml
rename to jenkins/client/job/docker/oss/cis-collectors.yml
diff --git a/jenkins/client/job/docker/devops-portal.yml b/jenkins/client/job/docker/oss/devops-portal.yml
similarity index 100%
rename from jenkins/client/job/docker/devops-portal.yml
rename to jenkins/client/job/docker/oss/devops-portal.yml
diff --git a/jenkins/client/job/docker/oss/init.yml b/jenkins/client/job/docker/oss/init.yml
new file mode 100644
index 0000000..9e36046
--- /dev/null
+++ b/jenkins/client/job/docker/oss/init.yml
@@ -0,0 +1,4 @@
+parameters:
+  - system.jenkins.client.job.docker.oss.cis-collectors
+  - system.jenkins.client.job.docker.oss.devops-portal
+  - system.jenkins.client.job.docker.oss.rundeck
diff --git a/jenkins/client/job/docker/rundeck.yml b/jenkins/client/job/docker/oss/rundeck.yml
similarity index 100%
rename from jenkins/client/job/docker/rundeck.yml
rename to jenkins/client/job/docker/oss/rundeck.yml
diff --git a/jenkins/client/job/oss/init.yml b/jenkins/client/job/oss/init.yml
new file mode 100644
index 0000000..0e23f01
--- /dev/null
+++ b/jenkins/client/job/oss/init.yml
@@ -0,0 +1,3 @@
+classes:
+  - system.jenkins.client.job.oss.test_devops_portal
+  - system.jenkins.client.job.oss.test_security_monkey_openstack
diff --git a/jenkins/client/job/test_devops_portal.yml b/jenkins/client/job/oss/test_devops_portal.yml
similarity index 100%
rename from jenkins/client/job/test_devops_portal.yml
rename to jenkins/client/job/oss/test_devops_portal.yml