Remove jenkins-slave element from DIB images
There is no jenkins, only zuul! With zuulv3 running in production, there is no more need to add jenkins user or scripts to our images. Move chmod of /opt/cache/files from nodepool/elements/jenkins-slave/install.d/20-jenkins-slave to nodepool/elements/zuul-worker/install.d/60-zuul-worker We also leave the jenkins-slave elements for now, in case 3rd party CI use them. Change-Id: Ia9750877fbc1a17ec467ca4ac685afdb9c1627f8 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
91400af8ba
commit
c919e1e782
@ -1,4 +1,3 @@
|
||||
jenkins-slave
|
||||
package-installs
|
||||
pip-and-virtualenv
|
||||
zuul-worker
|
||||
|
@ -1,24 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (C) 2011-2013 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
#
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# dib-lint: disable=setu setpipefail
|
||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
||||
set -x
|
||||
fi
|
||||
set -e
|
||||
|
||||
chown -R jenkins:jenkins /home/jenkins
|
@ -36,8 +36,8 @@ chown -R zuul:zuul /home/zuul
|
||||
# We've put the cache stuff into /opt/cache/files, but again, for
|
||||
# "historical" reasons, ensure this is available in /home/zuul
|
||||
#
|
||||
# We do this for zuul as well as jenkins users as relative paths to
|
||||
# the current user's homedir are used in places like devstack-gate.
|
||||
# We do this for zuul as relative paths to the current user's homedir
|
||||
# are used in places like devstack-gate.
|
||||
#
|
||||
# Check if the cache exists as we don't have a strict dependency on the
|
||||
# devstack-cache element. This allows you to build an image without
|
||||
@ -46,4 +46,6 @@ if [ -d /opt/cache/files ] ; then
|
||||
mkdir -p /home/zuul/cache
|
||||
chown zuul:zuul /home/zuul/cache
|
||||
ln -sf /opt/cache/files /home/zuul/cache/files
|
||||
# but make sure the cache is readable by everyone
|
||||
chmod -R a+rX /opt/cache/files/*
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user