Merge pull request #1232 from gunjan5/fix-release-scripts

Fix release scripts
projectcalico · Nov 1, 2016 · 6eb59b7 · 6eb59b7
2 parents f81a656 + 5699204
commit 6eb59b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/release-scripts/do_release.py b/release-scripts/do_release.py
@@ -62,8 +62,8 @@
     (re.compile(r'http://www\.projectcalico\.org/builds/calicoctl'),
      'http://www.projectcalico.org/builds/calicoctl?circleci-branch={version}-candidate'),
 
-    (re.compile(r'git\+https://github\.com/projectcalico/calico\.git'),
-     'git+https://github.com/projectcalico/calico.git@{calico-version}'),
+    (re.compile(r'git\+https://github\.com/projectcalico/felix\.git'),
+     'git+https://github.com/projectcalico/felix.git@{calico-version}'),
 
     (re.compile(r'git\+https://github\.com/projectcalico/libcalico\.git@master'),
      'git+https://github.com/projectcalico/libcalico.git@{libcalico-version}'),
@@ -167,7 +167,7 @@ def start_release():
 
         calico_version = \
             utils.get_github_library_version("calico (felix)", __felix_version__,
-                                             "https://github.com/projectcalico/calico")
+                                             "https://github.com/projectcalico/felix")
         libcalico_version = \
             utils.get_github_library_version("libcalico", __libcalico_version__,
                                              "https://github.com/projectcalico/libcalico")

diff --git a/release-scripts/utils.py b/release-scripts/utils.py
@@ -30,7 +30,6 @@
 # Path names relative to the root of the project
 PATH_CALICOCTL_NODE = path.join("calicoctl", "calico_ctl", "node.py")
 PATH_CALICOCTL_INIT = path.join("calicoctl", "calico_ctl", "__init__.py")
-PATH_CALICONODE_BUILD = path.join("calico_node", "build.sh")
 PATH_MAKEFILE = "Makefile"
 PATH_MAIN_README = "README.md"
 PATH_DOCS = "docs"
@@ -52,7 +51,6 @@
 # paths are relative to the project root.
 UPDATE_FILES_STATIC = [PATH_MAIN_README,
                        PATH_CALICOCTL_NODE,
-                       PATH_CALICONODE_BUILD,
                        PATH_CALICOCTL_INIT,
                        PATH_MAKEFILE]
 UPDATE_FILES_DIRS = [PATH_DOCS]