Merge pull request #4850 from sdodson/pr4655

Merged by openshift-bot

rel-eng/lib/origin/tagger/__init__.py → .tito/lib/origin/tagger/__init__.py

@@ -14,7 +14,7 @@
 from tito.common import (get_latest_commit, run_command,
         get_latest_tagged_version, increase_version, increase_zstream,
         get_spec_version_and_release, tag_exists_locally, tag_exists_remotely,
-        head_points_to_tag, undo_tag)
+        head_points_to_tag, undo_tag, tito_config_dir)
 #, get_spec_version_and_release
 from tito.compat import write
 from tito.tagger import VersionTagger
@@ -88,12 +88,12 @@ def _get_new_tag(self, new_version):
   def get_latest_tagged_version(package_name):
       """
       Return the latest git tag for this package in the current branch.
-      Uses the info in rel-eng/packages/package-name.
+      Uses the info in .tito/packages/package-name.
 
       Returns None if file does not exist.
       """
       git_root = find_git_root()
-      rel_eng_dir = os.path.join(git_root, "rel-eng")
+      rel_eng_dir = os.path.join(git_root, tito_config_dir())
       file_path = "%s/packages/%s" % (rel_eng_dir, package_name)
       debug("Getting latest package info from: %s" % file_path)
       if not os.path.exists(file_path):

rel-eng/tito.props → .tito/tito.props

@@ -4,7 +4,7 @@ tagger = origin.tagger.OriginTagger
 forceversiontagger = origin.tagger.OriginForceVersionTagger
 changelog_do_not_remove_cherrypick = 0
 changelog_format = %s (%ae)
-lib_dir = rel-eng/lib
+lib_dir = .tito/lib
 
 [requirements]
 tito = 0.6

Vagrantfile

@@ -27,9 +27,9 @@ end
 
 def full_provision(vm, username = [])
   if pre_vagrant_171
-    vm.provision "shell", path: "vagrant/provision-full.sh", args: username, id: "setup"
+    vm.provision "shell", path: "contrib/vagrant/provision-full.sh", args: username, id: "setup"
   else
-    vm.provision "setup", type: "shell", path: "vagrant/provision-full.sh", args: username
+    vm.provision "setup", type: "shell", path: "contrib/vagrant/provision-full.sh", args: username
   end
 end
 
@@ -133,7 +133,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.define "#{VM_NAME_PREFIX}dind-host" do |config|
       config.vm.box = kube_box[kube_os]["name"]
       config.vm.box_url = kube_box[kube_os]["box_url"]
-      config.vm.provision "shell", inline: "/vagrant/vagrant/provision-full.sh"
+      config.vm.provision "shell", inline: "/vagrant/contrib/vagrant/provision-full.sh"
       config.vm.provision "shell", inline: "/vagrant/hack/dind-cluster.sh start"
       config.vm.hostname = "openshift-dind-host"
       config.vm.synced_folder ".", "/vagrant", type: vagrant_openshift_config['sync_folders_type']
@@ -159,7 +159,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.define "#{VM_NAME_PREFIX}master" do |config|
       config.vm.box = kube_box[kube_os]["name"]
       config.vm.box_url = kube_box[kube_os]["box_url"]
-      config.vm.provision "shell", inline: "/vagrant/vagrant/provision-master.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} #{fixup_net_udev} #{ENV['OPENSHIFT_SDN']}"
+      config.vm.provision "shell", inline: "/vagrant/contrib/vagrant/provision-master.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} #{fixup_net_udev} #{ENV['OPENSHIFT_SDN']}"
       config.vm.network "private_network", ip: "#{master_ip}"
       config.vm.hostname = "openshift-master"
       config.vm.synced_folder ".", "/vagrant", type: vagrant_openshift_config['sync_folders_type']
@@ -172,7 +172,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         minion_ip = minion_ips[n]
         minion.vm.box = kube_box[kube_os]["name"]
         minion.vm.box_url = kube_box[kube_os]["box_url"]
-        minion.vm.provision "shell", inline: "/vagrant/vagrant/provision-minion.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} #{minion_ip} #{minion_index} #{fixup_net_udev}"
+        minion.vm.provision "shell", inline: "/vagrant/contrib/vagrant/provision-minion.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} #{minion_ip} #{minion_index} #{fixup_net_udev}"
         minion.vm.network "private_network", ip: "#{minion_ip}"
         minion.vm.hostname = "openshift-minion-#{minion_index}"
         config.vm.synced_folder ".", "/vagrant", type: vagrant_openshift_config['sync_folders_type']
@@ -189,9 +189,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config.vm.provision "shell", inline: "yum clean all && yum makecache"
       end
       if pre_vagrant_171
-        config.vm.provision "shell", path: "vagrant/provision-minimal.sh", id: "setup"
+        config.vm.provision "shell", path: "contrib/vagrant/provision-minimal.sh", id: "setup"
       else
-        config.vm.provision "setup", type: "shell", path: "vagrant/provision-minimal.sh"
+        config.vm.provision "setup", type: "shell", path: "contrib/vagrant/provision-minimal.sh"
       end
 
       config.vm.synced_folder ".", "/vagrant", disabled: true

cmd/genbashcomp/gen_openshift_bash_comp.go

@@ -32,7 +32,7 @@ func OutDir(path string) (string, error) {
 
 func main() {
 	// use os.Args instead of "flags" because "flags" will mess up the man pages!
-	path := "rel-eng/completions/bash/"
+	path := "contrib/completions/bash/"
 	if len(os.Args) == 2 {
 		path = os.Args[1]
 	} else if len(os.Args) > 2 {

contrib/kubernetes/pod.json

@@ -0,0 +1,22 @@
+{
+  "kind": "Pod",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "openshift"
+  },
+  "spec": {
+    "containers": [
+      {
+        "name": "origin",
+        "image": "openshift/origin",
+        "args": [ "start", "master" ],
+        "ports": [
+          {
+            "containerPort": 8443,
+            "protocol": "TCP"
+          }
+        ]
+      }
+    ]
+  }
+}

hack/update-generated-completions.sh

@@ -31,7 +31,7 @@ if [[ ! "$genbashcomp" ]]; then
 fi
 
 OUTPUT_REL_DIR=${1:-""}
-OUTPUT_DIR_ROOT="${OS_ROOT}/${OUTPUT_REL_DIR}/rel-eng/completions"
+OUTPUT_DIR_ROOT="${OS_ROOT}/${OUTPUT_REL_DIR}/contrib/completions"
 
 mkdir -p "${OUTPUT_DIR_ROOT}/bash" || echo $? > /dev/null
 

hack/verify-generated-completions.sh

@@ -17,7 +17,7 @@ if [[ "${platform}" != "linux/amd64" ]]; then
   exit 0
 fi
 
-COMPLETION_ROOT_REL="rel-eng/completions"
+COMPLETION_ROOT_REL="contrib/completions"
 COMPLETION_ROOT="${OS_ROOT}/${COMPLETION_ROOT_REL}"
 TMP_COMPLETION_ROOT_REL="_output/verify-generated-completions/"
 TMP_COMPLETION_ROOT="${OS_ROOT}/${TMP_COMPLETION_ROOT_REL}/${COMPLETION_ROOT_REL}"

origin.spec

@@ -12,7 +12,7 @@
 # openvswitch_version is the version of openvswitch requires by packages
 %global openvswitch_version 2.3.1
 # %commit and %ldflags are intended to be set by tito custom builders provided
-# in the rel-eng directory. The values in this spec file will not be kept up to date.
+# in the .tito/lib directory. The values in this spec file will not be kept up to date.
 %{!?commit:
 %global commit 86b5e46426ba828f49195af21c56f7c6674b48f7
 }
@@ -32,7 +32,7 @@
 
 Name:           %{package_name}
 # Version is not kept up to date and is intended to be set by tito custom
-# builders provided in the rel-eng directory of this project
+# builders provided in the .tito/lib directory of this project
 Version:        0.0.1
 Release:        0%{?dist}
 Summary:        Open Source Container Management by Red Hat
@@ -198,24 +198,24 @@ ln -s %{_bindir}/oc %{buildroot}%{_bindir}/kubectl
 install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}
 
 # different service for origin vs aos
-install -m 0644 rel-eng/%{name}-master.service %{buildroot}%{_unitdir}/%{name}-master.service
-install -m 0644 rel-eng/%{name}-node.service %{buildroot}%{_unitdir}/%{name}-node.service
+install -m 0644 contrib/systemd/%{name}-master.service %{buildroot}%{_unitdir}/%{name}-master.service
+install -m 0644 contrib/systemd/%{name}-node.service %{buildroot}%{_unitdir}/%{name}-node.service
 # same sysconfig files for origin vs aos
-install -m 0644 rel-eng/origin-master.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-master
-install -m 0644 rel-eng/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
+install -m 0644 contrib/systemd/origin-master.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-master
+install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
 install -d -m 0755 %{buildroot}%{_prefix}/lib/tuned/%{name}-node-{guest,host}
-install -m 0644 tuned/origin-node-guest/tuned.conf %{buildroot}%{_prefix}/lib/tuned/%{name}-node-guest/tuned.conf
-install -m 0644 tuned/origin-node-host/tuned.conf %{buildroot}%{_prefix}/lib/tuned/%{name}-node-host/tuned.conf
+install -m 0644 contrib/tuned/origin-node-guest/tuned.conf %{buildroot}%{_prefix}/lib/tuned/%{name}-node-guest/tuned.conf
+install -m 0644 contrib/tuned/origin-node-host/tuned.conf %{buildroot}%{_prefix}/lib/tuned/%{name}-node-host/tuned.conf
 install -d -m 0755 %{buildroot}%{_mandir}/man7
-install -m 0644 tuned/man/tuned-profiles-origin-node.7 %{buildroot}%{_mandir}/man7/tuned-profiles-%{name}-node.7
+install -m 0644 contrib/tuned/man/tuned-profiles-origin-node.7 %{buildroot}%{_mandir}/man7/tuned-profiles-%{name}-node.7
 
 mkdir -p %{buildroot}%{_sharedstatedir}/origin
 
 
 # Install sdn scripts
 install -d -m 0755 %{buildroot}%{kube_plugin_path}
 install -d -m 0755 %{buildroot}%{_unitdir}/docker.service.d
-install -p -m 0644 rel-eng/docker-sdn-ovs.conf %{buildroot}%{_unitdir}/docker.service.d/
+install -p -m 0644 contrib/systemd/docker-sdn-ovs.conf %{buildroot}%{_unitdir}/docker.service.d/
 pushd _thirdpartyhacks/src/%{sdn_import_path}/ovssubnet/controller/kube/bin
    install -p -m 755 openshift-ovs-subnet %{buildroot}%{kube_plugin_path}/openshift-ovs-subnet
    install -p -m 755 openshift-sdn-kube-subnet-setup.sh %{buildroot}%{_bindir}/openshift-sdn-kube-subnet-setup.sh
@@ -225,13 +225,13 @@ pushd _thirdpartyhacks/src/%{sdn_import_path}/ovssubnet/controller/multitenant/b
    install -p -m 755 openshift-sdn-multitenant-setup.sh %{buildroot}%{_bindir}/openshift-sdn-multitenant-setup.sh
 popd
 install -d -m 0755 %{buildroot}%{_unitdir}/%{name}-node.service.d
-install -p -m 0644 rel-eng/openshift-sdn-ovs.conf %{buildroot}%{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
+install -p -m 0644 contrib/systemd/openshift-sdn-ovs.conf %{buildroot}%{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf
 
 # Install bash completions
 install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d/
-install -p -m 644 rel-eng/completions/bash/* %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p -m 644 contrib/completions/bash/* %{buildroot}%{_sysconfdir}/bash_completion.d/
 # Generate atomic-enterprise bash completions
-%{__sed} -e "s|openshift|atomic-enterprise|g" rel-eng/completions/bash/openshift > %{buildroot}%{_sysconfdir}/bash_completion.d/atomic-enterprise
+%{__sed} -e "s|openshift|atomic-enterprise|g" contrib/completions/bash/openshift > %{buildroot}%{_sysconfdir}/bash_completion.d/atomic-enterprise
 
 %files
 %defattr(-,root,root,-)