summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitlab.morph4
-rw-r--r--scripts/do-release.py6
-rw-r--r--tools.morph2
3 files changed, 5 insertions, 7 deletions
diff --git a/gitlab.morph b/gitlab.morph
index a731290a..bc345e1e 100644
--- a/gitlab.morph
+++ b/gitlab.morph
@@ -6,8 +6,8 @@ build-depends:
chunks:
- name: gitlab-ce
repo: upstream:gitlab/gitlab-ce
- ref: cdec1324173c2331153b671ef6ebab749bca9cd4
- unpetrify-ref: baserock/morph
+ ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425
+ unpetrify-ref: baserock/v7.0.0
build-depends: []
- name: gitlab-ci
repo: upstream:gitlab/gitlab-ci
diff --git a/scripts/do-release.py b/scripts/do-release.py
index 43ce7201..5a86f090 100644
--- a/scripts/do-release.py
+++ b/scripts/do-release.py
@@ -41,8 +41,6 @@ class config(object):
build_trove = 'hawkdevtrove'
release_trove = 'git.baserock.org'
- # Note that the 'location' field of the various systems in release.morph
- # should match 'images_dir' here.
deploy_workspace = '/src/ws-release'
images_dir = '/src/release'
artifacts_dir = '/src/release/artifacts'
@@ -71,8 +69,7 @@ def status(message, *args):
@contextlib.contextmanager
def cwd(path):
- '''
- Context manager to set current working directory.'''
+ '''Context manager to set current working directory.'''
old_cwd = os.getcwd()
os.chdir(path)
try:
@@ -212,6 +209,7 @@ class DeployImages(object):
class ArtifactsBundle(object):
+ '''State that is the results of the PrepareArtifacts stage.'''
def __init__(self, all_artifacts, new_artifacts,
all_artifacts_manifest, all_artifacts_tar,
new_artifacts_tar):
diff --git a/tools.morph b/tools.morph
index a97bcab8..50ed3fe3 100644
--- a/tools.morph
+++ b/tools.morph
@@ -92,7 +92,7 @@ chunks:
- six
- name: morph
repo: baserock:baserock/morph
- ref: 770a6cb434ac31238eb2eee526e235728ce07aff
+ ref: ad65450c145e3283f95a40397280fc8b938a04c0
unpetrify-ref: master
build-depends:
- cliapp