From 48d3b62cab4b03ae01fe169df7b52ab42fb41914 Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 6 Oct 2021 17:28:34 +0000 Subject: [PATCH 1/3] Removed scripts that were added into their respective repos. See: https://github.com/opensearch-project/common-utils/pull/79 https://github.com/opensearch-project/common-utils/pull/80 https://github.com/opensearch-project/job-scheduler/pull/71 https://github.com/opensearch-project/job-scheduler/pull/72 Signed-off-by: dblock --- scripts/components/common-utils/build.sh | 64 --------------------- scripts/components/job-scheduler/build.sh | 69 ----------------------- 2 files changed, 133 deletions(-) delete mode 100755 scripts/components/common-utils/build.sh delete mode 100755 scripts/components/job-scheduler/build.sh diff --git a/scripts/components/common-utils/build.sh b/scripts/components/common-utils/build.sh deleted file mode 100755 index 3f803013c4..0000000000 --- a/scripts/components/common-utils/build.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. - -set -ex - -function usage() { - echo "Usage: $0 [args]" - echo "" - echo "Arguments:" - echo -e "-v VERSION\t[Required] OpenSearch version." - echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." - echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." - echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'." - echo -e "-h help" -} - -while getopts ":h:v:s:o:a:" arg; do - case $arg in - h) - usage - exit 1 - ;; - v) - VERSION=$OPTARG - ;; - s) - SNAPSHOT=$OPTARG - ;; - o) - OUTPUT=$OPTARG - ;; - a) - ARCHITECTURE=$OPTARG - ;; - :) - echo "Error: -${OPTARG} requires an argument" - usage - exit 1 - ;; - ?) - echo "Invalid option: -${arg}" - exit 1 - ;; - esac -done - -if [ -z "$VERSION" ]; then - echo "Error: You must specify the OpenSearch version" - usage - exit 1 -fi - -[[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT -[ -z "$OUTPUT" ] && OUTPUT=artifacts - -./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -mkdir -p $OUTPUT/maven/org/opensearch -cp -r ~/.m2/repository/org/opensearch/common-utils $OUTPUT/maven/org/opensearch/common-utils diff --git a/scripts/components/job-scheduler/build.sh b/scripts/components/job-scheduler/build.sh deleted file mode 100755 index 3a2e1c0fd4..0000000000 --- a/scripts/components/job-scheduler/build.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. - -set -ex - -function usage() { - echo "Usage: $0 [args]" - echo "" - echo "Arguments:" - echo -e "-v VERSION\t[Required] OpenSearch version." - echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." - echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." - echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'." - echo -e "-h help" -} - -while getopts ":h:v:s:o:a:" arg; do - case $arg in - h) - usage - exit 1 - ;; - v) - VERSION=$OPTARG - ;; - s) - SNAPSHOT=$OPTARG - ;; - o) - OUTPUT=$OPTARG - ;; - a) - ARCHITECTURE=$OPTARG - ;; - :) - echo "Error: -${OPTARG} requires an argument" - usage - exit 1 - ;; - ?) - echo "Invalid option: -${arg}" - exit 1 - ;; - esac -done - -if [ -z "$VERSION" ]; then - echo "Error: You must specify the OpenSearch version" - usage - exit 1 -fi - -[[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT -./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT - -./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -mkdir -p $OUTPUT/maven/org/opensearch -cp -r ~/.m2/repository/org/opensearch/opensearch-job-scheduler $OUTPUT/maven/org/opensearch -cp -r ~/.m2/repository/org/opensearch/opensearch-job-scheduler-spi $OUTPUT/maven/org/opensearch - -./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -[ -z "$OUTPUT" ] && OUTPUT=artifacts -mkdir -p $OUTPUT/plugins -cp ./build/distributions/*.zip $OUTPUT/plugins From 69471a6cb287e9af4d46f77905f96385520878b1 Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 6 Oct 2021 17:29:46 +0000 Subject: [PATCH 2/3] Removed PA and PA RCA from Maven publication. Signed-off-by: dblock --- scripts/components/performance-analyzer-rca/build.sh | 4 ---- scripts/components/performance-analyzer/build.sh | 4 ---- 2 files changed, 8 deletions(-) diff --git a/scripts/components/performance-analyzer-rca/build.sh b/scripts/components/performance-analyzer-rca/build.sh index df44a7abf4..9b7543c199 100755 --- a/scripts/components/performance-analyzer-rca/build.sh +++ b/scripts/components/performance-analyzer-rca/build.sh @@ -59,7 +59,3 @@ fi [ -z "$OUTPUT" ] && OUTPUT=artifacts ./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -x test - -mkdir -p $OUTPUT/maven/org/opensearch -./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -cp -r ~/.m2/repository/org/opensearch/performanceanalyzer-rca $OUTPUT/maven/org/opensearch \ No newline at end of file diff --git a/scripts/components/performance-analyzer/build.sh b/scripts/components/performance-analyzer/build.sh index 27eb16b0bf..e186503875 100755 --- a/scripts/components/performance-analyzer/build.sh +++ b/scripts/components/performance-analyzer/build.sh @@ -61,7 +61,3 @@ fi ./gradlew build -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -x test mkdir -p $OUTPUT/plugins cp ./build/distributions/*.zip $OUTPUT/plugins - -mkdir -p $OUTPUT/maven/org/opensearch -./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -cp -r ~/.m2/repository/org/opensearch/opensearch-performance-analyzer $OUTPUT/maven/org/opensearch From 9aca2274b3ff15acf027f65c7649e7c72aea0155 Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 6 Oct 2021 18:25:00 +0000 Subject: [PATCH 3/3] Removed alerting that was moved to its repo. https://github.com/opensearch-project/alerting/pull/196 https://github.com/opensearch-project/alerting/pull/197 Signed-off-by: dblock --- scripts/components/alerting/build.sh | 75 ---------------------------- 1 file changed, 75 deletions(-) delete mode 100755 scripts/components/alerting/build.sh diff --git a/scripts/components/alerting/build.sh b/scripts/components/alerting/build.sh deleted file mode 100755 index d12218a024..0000000000 --- a/scripts/components/alerting/build.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. - -set -ex - -function usage() { - echo "Usage: $0 [args]" - echo "" - echo "Arguments:" - echo -e "-v VERSION\t[Required] OpenSearch version." - echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." - echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." - echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'." - echo -e "-h help" -} - -while getopts ":h:v:s:o:a:" arg; do - case $arg in - h) - usage - exit 1 - ;; - v) - VERSION=$OPTARG - ;; - s) - SNAPSHOT=$OPTARG - ;; - o) - OUTPUT=$OPTARG - ;; - a) - ARCHITECTURE=$OPTARG - ;; - :) - echo "Error: -${OPTARG} requires an argument" - usage - exit 1 - ;; - ?) - echo "Invalid option: -${arg}" - exit 1 - ;; - esac -done - -if [ -z "$VERSION" ]; then - echo "Error: You must specify the OpenSearch version" - usage - exit 1 -fi - -[[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT -[ -z "$OUTPUT" ] && OUTPUT=artifacts - -mkdir -p $OUTPUT/plugins - -./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -x ktlint - -zipPath=$(find . -path \*build/distributions/*.zip) -distributions="$(dirname "${zipPath}")" - -echo "COPY ${distributions}/*.zip" -cp ${distributions}/*.zip ./$OUTPUT/plugins - -./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -x ktlint - -mkdir -p $OUTPUT/maven/org/opensearch -cp -r ~/.m2/repository/org/opensearch/notification $OUTPUT/maven/org/opensearch/notification -