Commit af0748f2 authored by Ilias Tsitsimpis's avatar Ilias Tsitsimpis
Browse files

ci: snf-deploy is now part of Synnefo software

Install snf-deploy from the Synnefo repo
and not from it's old one.
parent 22e9fd1b
...@@ -8,8 +8,6 @@ synnefo_repo = https://code.grnet.gr/git/synnefo ...@@ -8,8 +8,6 @@ synnefo_repo = https://code.grnet.gr/git/synnefo
# Git branch to test (specify sha1 or branch name). If not set, the # Git branch to test (specify sha1 or branch name). If not set, the
# branch/sha will result from the current repository. # branch/sha will result from the current repository.
synnefo_branch = synnefo_branch =
# snf-deploy git repo
deploy_repo = https://code.grnet.gr/git/snf-deploy
# Defines the schema that snf-deploy will use # Defines the schema that snf-deploy will use
schema = one_node schema = one_node
# Local dir to save builded packages # Local dir to save builded packages
......
...@@ -465,10 +465,6 @@ class SynnefoCI(object): ...@@ -465,10 +465,6 @@ class SynnefoCI(object):
self.logger.error("Can not clone Synnefo repo.") self.logger.error("Can not clone Synnefo repo.")
sys.exit(-1) sys.exit(-1)
deploy_repo = self.config.get('Global', 'deploy_repo')
self.logger.debug("Clone snf-deploy from %s" % deploy_repo)
_run("git clone --depth 1 %s" % deploy_repo, False)
@_check_fabric @_check_fabric
def build_synnefo(self): def build_synnefo(self):
"""Build Synnefo packages""" """Build Synnefo packages"""
...@@ -490,33 +486,25 @@ class SynnefoCI(object): ...@@ -490,33 +486,25 @@ class SynnefoCI(object):
""" """
_run(cmd, False) _run(cmd, False)
self.logger.debug("Build snf-deploy package") # Build synnefo packages
self.logger.debug("Build synnefo packages")
cmd = """ cmd = """
git checkout -t origin/debian devflow-autopkg snapshot -b ~/synnefo_build-area --no-sign
git-buildpackage --git-upstream-branch=master \
--git-debian-branch=debian \
--git-export-dir=../snf-deploy_build-area \
-uc -us
""" """
with fabric.cd("snf-deploy"): with fabric.cd("synnefo"):
_run(cmd, True) _run(cmd, True)
# Install snf-deploy package
self.logger.debug("Install snf-deploy package") self.logger.debug("Install snf-deploy package")
cmd = """ cmd = """
dpkg -i snf-deploy*.deb dpkg -i snf-deploy*.deb
apt-get -f install --yes apt-get -f install --yes
""" """
with fabric.cd("snf-deploy_build-area"): with fabric.cd("synnefo_build-area"):
with fabric.settings(warn_only=True): with fabric.settings(warn_only=True):
_run(cmd, True) _run(cmd, True)
self.logger.debug("Build synnefo packages") # Setup synnefo packages for snf-deploy
cmd = """
devflow-autopkg snapshot -b ~/synnefo_build-area --no-sign
"""
with fabric.cd("synnefo"):
_run(cmd, True)
self.logger.debug("Copy synnefo debs to snf-deploy packages dir") self.logger.debug("Copy synnefo debs to snf-deploy packages dir")
cmd = """ cmd = """
cp ~/synnefo_build-area/*.deb /var/lib/snf-deploy/packages/ cp ~/synnefo_build-area/*.deb /var/lib/snf-deploy/packages/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment