From 91400af8babce7ef9e6eda96ef597b9b51b7f1b1 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 10 Feb 2018 18:28:52 +0100 Subject: [PATCH] Good bye jenkins/scripts We now only have afs-slug.sh in jenkins/scripts/ and it is only used by nodepool/scripts/configure_mirror.sh. Move the file into the nodepool/scripts directory and adjust paths. Remove copying of jenkins/scripts from nodepool, the directory does not exist anymore. Remove 89-jenkins-scripts, we don't need it anymore. Depends-On: https://review.openstack.org/548393 Change-Id: I13cac791d70a2e5bcb0de1ba0adcd79e1b0aee9f --- .../post-install.d/89-jenkins-scripts | 29 ------------------- {jenkins => nodepool}/scripts/afs-slug.sh | 0 2 files changed, 29 deletions(-) delete mode 100755 nodepool/elements/nodepool-base/post-install.d/89-jenkins-scripts rename {jenkins => nodepool}/scripts/afs-slug.sh (100%) diff --git a/nodepool/elements/nodepool-base/post-install.d/89-jenkins-scripts b/nodepool/elements/nodepool-base/post-install.d/89-jenkins-scripts deleted file mode 100755 index 65f6333b1a..0000000000 --- a/nodepool/elements/nodepool-base/post-install.d/89-jenkins-scripts +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# Copyright (C) 2011-2013 OpenStack Foundation -# Copyright 2016 Red Hat, Inc. -# -# 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. - -if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then - set -x -fi -set -eu -set -o pipefail - -# NOTE(pabelanger): Until zuulv3 lands, manually copy scripts / data into -# /usr/local/jenkins. -mkdir -p /usr/local/jenkins -cp -a /opt/git/openstack-infra/project-config/jenkins/scripts \ - /usr/local/jenkins/slave_scripts diff --git a/jenkins/scripts/afs-slug.sh b/nodepool/scripts/afs-slug.sh similarity index 100% rename from jenkins/scripts/afs-slug.sh rename to nodepool/scripts/afs-slug.sh