Merge pull request #20503 from sdodson/release-3.10

openshift-merge-robot · web-flow · commit e9069f950c9b · 2018-08-02T05:08:30.000-07:00
Injecting new required vars into origin.spec file
diff --git a/.tito/lib/origin/common.py b/.tito/lib/origin/common.py
@@ -33,7 +33,7 @@ def get_os_git_vars():
     git_vars = {}
     for var_name in ["OS_GIT_COMMIT", "OS_GIT_VERSION", "OS_GIT_MAJOR", "OS_GIT_MINOR", "OS_GIT_PATCH",
                      "ETCD_GIT_VERSION", "ETCD_GIT_COMMIT",
-                     "KUBE_GIT_VERSION", "KUBE_GIT_COMMIT"]:
+                     "KUBE_GIT_VERSION", "KUBE_GIT_COMMIT", "KUBE_GIT_MAJOR", "KUBE_GIT_MINOR"]:
         git_vars[var_name] = run_command(
             "bash -c 'source ./hack/lib/init.sh; os::build::version::git_vars; echo ${}'".format(var_name)
         )

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ def get_os_git_vars():`
`33`	`33`	`git_vars = {}`
`34`	`34`	`for var_name in ["OS_GIT_COMMIT", "OS_GIT_VERSION", "OS_GIT_MAJOR", "OS_GIT_MINOR", "OS_GIT_PATCH",`
`35`	`35`	`"ETCD_GIT_VERSION", "ETCD_GIT_COMMIT",`
`36`		`- "KUBE_GIT_VERSION", "KUBE_GIT_COMMIT"]:`
	`36`	`+ "KUBE_GIT_VERSION", "KUBE_GIT_COMMIT", "KUBE_GIT_MAJOR", "KUBE_GIT_MINOR"]:`
`37`	`37`	`git_vars[var_name] = run_command(`
`38`	`38`	`"bash -c 'source ./hack/lib/init.sh; os::build::version::git_vars; echo ${}'".format(var_name)`
`39`	`39`	`)`