Skip to content

Commit a6cd2f0

Browse files
committed
Remove duplicate packaging test scripts
1 parent e9d4304 commit a6cd2f0

File tree

5 files changed

+2
-106
lines changed

5 files changed

+2
-106
lines changed

.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@
4040
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
4141
- shell: |
4242
#!/usr/local/bin/runbld --redirect-stderr
43-
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructivePackagingTest
43+
./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructivePackagingTest

.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-upgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
JAVA16_HOME=$HOME/.java/openjdk16
3030
- shell: |
3131
#!/usr/local/bin/runbld --redirect-stderr
32-
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v$BWC_VERSION
32+
./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v$BWC_VERSION

.ci/os.ps1

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

.ci/os.sh

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

.ci/scripts/packaging-test.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ If (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent
1010
$AppProps = ConvertFrom-StringData (Get-Content .ci/java-versions.properties -raw)
1111
$env:ES_BUILD_JAVA=$AppProps.ES_BUILD_JAVA
1212
$env:ES_RUNTIME_JAVA=$AppProps.ES_RUNTIME_JAVA
13-
$env:JAVA_TOOL_OPTIONS=''
1413

1514
$ErrorActionPreference="Stop"
1615
$gradleInit = "C:\Users\$env:username\.gradle\init.d\"

0 commit comments

Comments
 (0)