Skip to content

Commit b9692ec

Browse files
author
Dmitriy Rabotyagov
committed
Remove unset-ansible-env hook
This hook was required for upgrade to collectifying our plugins repo and is not needed anymore. Change-Id: I340c3695e9a04f9dea6498e13cfeba59549aceb4 Signed-off-by: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
1 parent 86a01f5 commit b9692ec

3 files changed

Lines changed: 0 additions & 15 deletions

File tree

scripts/gate-check-commit.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@ if [[ "${ACTION}" =~ "upgrade" ]]; then
284284
echo 'YES' | SOURCE_SERIES=${UPGRADE_SOURCE_RELEASE} bash "${OSA_CLONE_DIR}/scripts/run-upgrade.sh"
285285

286286
if [[ $SCENARIO =~ "infra" ]]; then
287-
# TODO(noonedeadpunk): Remove after Y release
288-
set -a
289-
. ${OSA_CLONE_DIR}/scripts/upgrade-utilities/unset-ansible-env.rc
290-
set +a
291287
# Verify our infra setup after upgrade
292288
openstack-ansible ${OSA_CLONE_DIR}/playbooks/healthcheck-infrastructure.yml -e osa_gather_facts=False
293289
fi

scripts/run-upgrade.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@ function main {
188188
# To ensure this is not the case, we unset the environment variable.
189189
unset ANSIBLE_INVENTORY
190190

191-
# TODO(noonedeadpunk): Remove after Y release
192-
source ${SCRIPTS_PATH}/upgrade-utilities/unset-ansible-env.rc
193-
194191
bootstrap_ansible
195192

196193
pushd ${MAIN_PATH}/playbooks

scripts/upgrade-utilities/unset-ansible-env.rc

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)