From b10a8400f0134c03df4972a02abdf8f24bc6b9d3 Mon Sep 17 00:00:00 2001 From: LiZhenCheng9527 Date: Thu, 1 Feb 2024 11:58:26 +0800 Subject: [PATCH] use commit ID as the VERSION Signed-off-by: LiZhenCheng9527 --- e2e/resources/constant.go | 28 ---------------------- hack/e2e-test/install.sh | 3 ++- licenses/github.com/onsi/ginkgo/v2/LICENSE | 20 ++++++++++++++++ 3 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 e2e/resources/constant.go create mode 100644 licenses/github.com/onsi/ginkgo/v2/LICENSE diff --git a/e2e/resources/constant.go b/e2e/resources/constant.go deleted file mode 100644 index 374bd3921..000000000 --- a/e2e/resources/constant.go +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright Kurator Authors. - -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. -*/ - -package resources - -import "time" - -const ( - // pollInterval defines the interval time for a poll operation. - pollInterval = 5 * time.Second - // pollTimeout defines the time after which the poll operation times out. - pollTimeout = 420 * time.Second - // metricsCreationDelay defines the maximum time metrics not yet available for pod. - metricsCreationDelay = 2 * time.Minute -) diff --git a/hack/e2e-test/install.sh b/hack/e2e-test/install.sh index 8e2bec1cb..aa7aa3da5 100755 --- a/hack/e2e-test/install.sh +++ b/hack/e2e-test/install.sh @@ -9,7 +9,8 @@ set -o pipefail KUBECONFIG_PATH=${KUBECONFIG_PATH:-"${HOME}/.kube"} MAIN_KUBECONFIG=${MAIN_KUBECONFIG:-"${KUBECONFIG_PATH}/kurator-host.config"} export KUBECONFIG=${MAIN_KUBECONFIG} -VERSION=${VERSION:-"0.95.27"} +COMMIT_ID=$(git rev-parse --short HEAD) +VERSION=${COMMIT_ID} sleep 5s diff --git a/licenses/github.com/onsi/ginkgo/v2/LICENSE b/licenses/github.com/onsi/ginkgo/v2/LICENSE new file mode 100644 index 000000000..9415ee72c --- /dev/null +++ b/licenses/github.com/onsi/ginkgo/v2/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2013-2014 Onsi Fakhouri + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.