added-all

kubedb · Jul 8, 2017 · 2e6182b · 2e6182b
1 parent f4d9109
commit 2e6182b
Showing 1 changed file with 44 additions and 71 deletions.
diff --git a/hack/release.py b/hack/release.py
@@ -92,7 +92,7 @@ def glide_mod(glide_config, changes):
 def glide_write(f, glide_config):
     f.seek(0)
     pkg = glide_config.pop('package')
-    out = 'package: ' + pkg + '\n' + yaml.dump(glide_config, default_flow_style=False)        
+    out = 'package: ' + pkg + '\n' + yaml.dump(glide_config, default_flow_style=False)
     f.write(out)
     f.truncate()
     glide_config['package'] = pkg
@@ -131,8 +131,8 @@ def release_apimachinery(self):
         call('git merge master', cwd=repo)
         call('git push origin {0}'.format(self.release_branch), cwd=repo)
 
-    def release_db(self, db):
-        repo = libbuild.GOPATH + '/src/github.com/k8sdb/' + db
+    def release_db(self, repo_name, short_code):
+        repo = libbuild.GOPATH + '/src/github.com/k8sdb/' + repo_name
         print(repo)
         print('----------------------------------------------------------------------------------------')
         git_checkout('master', cwd=repo)
@@ -152,9 +152,37 @@ def release_db(self, db):
             call('git tag -fa {0}'.format(self.tag), cwd=repo)
             call('git push origin {0} --tags'.format(self.release_branch), cwd=repo)
             call('rm -rf dist', cwd=repo)
-            call('./hack/docker/pg-operator/setup.sh', cwd=repo)
-            call('env APPSCODE_ENV=prod ./hack/docker/pg-operator/setup.sh release', cwd=repo)
-            git_checkout('master', cwd=repo) 
+            call('./hack/docker/{0}-operator/setup.sh'.format(short_code), cwd=repo)
+            call('env APPSCODE_ENV=prod ./hack/docker/{0}-operator/setup.sh release'.format(short_code), cwd=repo)
+            git_checkout('master', cwd=repo)
+            glide_mod(glide_config, self.master_deps)
+            glide_write(glide_file, glide_config)
+            call('git commit -a -m "Start {0} dev cycle"'.format(self.next_version), cwd=repo, eoe=False)
+            call('git push origin master', cwd=repo)
+
+    def release_cli(self):
+        repo = libbuild.GOPATH + '/src/github.com/k8sdb/cli'
+        print(repo)
+        print('----------------------------------------------------------------------------------------')
+        git_checkout('master', cwd=repo)
+        with open(repo + '/glide.yaml', 'r+') as glide_file:
+            glide_config = yaml.load(glide_file)
+            glide_mod(glide_config, self.rel_deps)
+            glide_write(glide_file, glide_config)
+            call('glide slow', cwd=repo)
+            if git_requires_commit(cwd=repo):
+                call('./hack/make.py', cwd=repo)
+                call('git commit -a -m "Prepare release {0}"'.format(self.tag), cwd=repo, eoe=False)
+                call('git push origin master', cwd=repo)
+            else:
+                call('git reset HEAD --hard', cwd=repo)
+            git_checkout(self.release_branch, cwd=repo)
+            call('git merge master', cwd=repo)
+            call('git tag -fa {0}'.format(self.tag), cwd=repo)
+            call('git push origin {0} --tags'.format(self.release_branch), cwd=repo)
+            call('rm -rf dist', cwd=repo)
+            call('env APPSCODE_ENV=prod ./hack/make.py build', cwd=repo)
+            git_checkout('master', cwd=repo)
             glide_mod(glide_config, self.master_deps)
             glide_write(glide_file, glide_config)
             call('git commit -a -m "Start {0} dev cycle"'.format(self.next_version), cwd=repo, eoe=False)
@@ -163,71 +191,16 @@ def release_db(self, db):
 
 def release(tag=None):
     cat = Kitten(tag)
-    # cat.release_apimachinery()
-    # cat.release_db('postgres')
-    cat.release_db('elasticsearch')
-
-    # version = semver.parse(tag)
-    # next_version = semver.bump_minor(tag)
-    # release_branch = 'release-{0}.{1}'.format(version['major'], version['minor'])
-    # rel_deps = {
-    #     'github.com/k8sdb/apimachinery': release_branch,
-    #     'github.com/k8sdb/postgres': release_branch,
-    #     'github.com/k8sdb/elasticsearch': release_branch,
-    # }
-    # master_deps = {
-    #     'github.com/k8sdb/apimachinery': 'master',
-    #     'github.com/k8sdb/postgres': 'master',
-    #     'github.com/k8sdb/elasticsearch': 'master',
-    # }
-
-    # repo = libbuild.GOPATH + '/src/github.com/k8sdb/apimachinery'
-    # print(repo)
-    # print('----------------------------------------------------------------------------------------')
-    # call('git checkout master', cwd=repo)
-    # # call('./hack/make.py', cwd=repo)
-    # git_checkout(release_branch, cwd=repo)
-    # call('git push origin {0}'.format(release_branch), cwd=repo)
-
-
-    # repo = libbuild.GOPATH + '/src/github.com/k8sdb/postgres'
-    # print(repo)
-    # print('----------------------------------------------------------------------------------------')
-    # call('git checkout master', cwd=repo)
-    # with open(repo + '/glide.yaml', 'r+') as glide_file:
-    #     glide_config = yaml.load(glide_file)
-    #     glide_mod(glide_config, rel_deps)
-    #     glide_write(glide_file, glide_config)
-    #     call('glide slow', cwd=repo) 
-    #     call('./hack/make.py', cwd=repo)
-    #     call('git commit -a -m "prepare release {0}"'.format(tag), cwd=repo, eoe=False)
-    #     call('git push origin master', cwd=repo)
-    #     git_checkout(release_branch, cwd=repo)
-    #     call('git push origin {0} --tags'.format(release_branch), cwd=repo)
-    #     call('rm -rf dist', cwd=repo)
-    #     call('./hack/docker/pg-operator/setup.sh', cwd=repo)
-    #     call('env APPSCODE_ENV=prod ./hack/docker/pg-operator/setup.sh release', cwd=repo)
-
-
-    #     call('git checkout master', cwd=repo) 
-    #     glide_mod(glide_config, master_deps)
-    #     glide_write(glide_file, glide_config)
-    #     call('git commit -a -m "start {0} dev cycle"'.format(next_version), cwd=repo, eoe=False)
-    #     call('git push origin master', cwd=repo)
-
-    # # call('./hack/make.py', cwd=repo)
-    # git_checkout(release_branch, cwd=repo)
-    # call('git push origin {0}'.format(release_branch), cwd=repo)
+    cat.release_apimachinery()
+    cat.release_db('postgres', 'pg')
+    cat.release_db('elasticsearch', 'es')
+    cat.release_cli()
 
 
 if __name__ == "__main__":
-    print check_output('git diff --name-only').strip().split('\n')
-
-
-
-    # if len(sys.argv) > 1:
-    #     # http://stackoverflow.com/a/834451
-    #     # http://stackoverflow.com/a/817296
-    #     release(*sys.argv[1:])
-    # else:
-    #     print('Usage ./hack/release.py 0.3.0')
+    if len(sys.argv) > 1:
+        # http://stackoverflow.com/a/834451
+        # http://stackoverflow.com/a/817296
+        release(*sys.argv[1:])
+    else:
+        print('Usage ./hack/release.py 0.3.0')