Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399369 )
Change subject: docker: add missing symlinks for castor ...................................................................... docker: add missing symlinks for castor Change-Id: I568fc61255c6bf60131ab2e63de85582218b3de5 --- A dockerfiles/castor/castor-define-namespace.bash A dockerfiles/castor/castor-load-sync.bash M dockerfiles/castor/changelog M jjb/castor-save-workspacecache.bash M jjb/castor.yaml 5 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/69/399369/1 diff --git a/dockerfiles/castor/castor-define-namespace.bash b/dockerfiles/castor/castor-define-namespace.bash new file mode 120000 index 0000000..2f1c181 --- /dev/null +++ b/dockerfiles/castor/castor-define-namespace.bash @@ -0,0 +1 @@ +../../jjb/castor-define-namespace.bash \ No newline at end of file diff --git a/dockerfiles/castor/castor-load-sync.bash b/dockerfiles/castor/castor-load-sync.bash new file mode 120000 index 0000000..7de33d8 --- /dev/null +++ b/dockerfiles/castor/castor-load-sync.bash @@ -0,0 +1 @@ +../../jjb/castor-load-sync.bash \ No newline at end of file diff --git a/dockerfiles/castor/changelog b/dockerfiles/castor/changelog index ff818d4..96719d8 100644 --- a/dockerfiles/castor/changelog +++ b/dockerfiles/castor/changelog @@ -1,3 +1,9 @@ +castor (0.1.3) wikimedia; urgency=medium + + * Add missing symlinks to castor bash scripts + + -- Antoine Musso <[email protected]> Wed, 20 Dec 2017 11:02:12 +0100 + castor (0.1.2) wikimedia; urgency=medium * Always point FROM to docker-registry.wikimedia.org, since we can not pull diff --git a/jjb/castor-save-workspacecache.bash b/jjb/castor-save-workspacecache.bash index bb11f12..0512684 100644 --- a/jjb/castor-save-workspacecache.bash +++ b/jjb/castor-save-workspacecache.bash @@ -20,7 +20,7 @@ --archive \ --compress \ --rsh="/usr/bin/ssh -a -T -o ConnectTimeout=6 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" \ - --rsync-path="docker run --rm -i --volume ${remote_cache_dir}:${cache_dir} --entrypoint=/usr/bin/rsync docker-registry.wikimedia.org/releng/castor:0.1.2" \ + --rsync-path="docker run --rm -i --volume ${remote_cache_dir}:${cache_dir} --entrypoint=/usr/bin/rsync docker-registry.wikimedia.org/releng/castor:0.1.3" \ --delete-delay \ jenkins-deploy@"${REMOTE_INSTANCE}:${cache_dir}/" "${DEST}" diff --git a/jjb/castor.yaml b/jjb/castor.yaml index 0fafbe2..f0f0925 100644 --- a/jjb/castor.yaml +++ b/jjb/castor.yaml @@ -66,7 +66,7 @@ exec docker run --rm \ --env-file <(/usr/bin/env|egrep -v '^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \ --volume "$(pwd)"/cache:/cache \ - 'docker-registry.wikimedia.org/releng/castor:0.1.2' clear || : + 'docker-registry.wikimedia.org/releng/castor:0.1.3' clear || : # nothing else can be executed due to exec # Entry point to load cache from central cache @@ -92,7 +92,7 @@ exec docker run --rm \ --env-file <(/usr/bin/env|egrep -v '^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \ --volume "${WORKSPACE}/cache":/cache \ - docker-registry.wikimedia.org/releng/castor:0.1.2 \ + docker-registry.wikimedia.org/releng/castor:0.1.3 \ load # nothing else can be executed due to exec -- To view, visit https://gerrit.wikimedia.org/r/399369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I568fc61255c6bf60131ab2e63de85582218b3de5 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
