From 84899eca4c6dcc6def56abae781e5489c4f950a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 3 Jan 2018 08:13:36 +0200 Subject: [PATCH] Consolidate prefixes of provisioning scripts Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e Reviewed-by: Jani Heikkinen --- .../{mqtt_broker.sh => 22-mqtt_broker.sh} | 0 .../{mqtt_broker.sh => 22-mqtt_broker.sh} | 0 .../22-mqtt_broker.sh} | 0 .../{freeopcua.sh => 42-freeopcua.sh} | 0 .../mqtt_broker.sh | 36 ------------------- .../22-mqtt_broker.sh} | 0 .../mqtt_broker.sh | 36 ------------------- .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 .../{winrtrunner.ps1 => 23-winrtrunner.ps1} | 0 .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 .../{winrtrunner.ps1 => 23-winrtrunner.ps1} | 0 .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 13 files changed, 72 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{mqtt_broker.sh => 22-mqtt_broker.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{mqtt_broker.sh => 22-mqtt_broker.sh} (100%) rename coin/provisioning/{qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh => qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{freeopcua.sh => 42-freeopcua.sh} (100%) delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh rename coin/provisioning/{qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh => qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh} (100%) delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh rename coin/provisioning/qtci-windows-10-x86/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{winrtrunner.ps1 => 23-winrtrunner.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{winrtrunner.ps1 => 23-winrtrunner.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh deleted file mode 100644 index e367c20b..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh deleted file mode 100644 index e367c20b..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 rename to coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1