Skip to content

Commit a47ecf2

Browse files
committed
Remove duplicate packaging test scripts
1 parent 9cdc41c commit a47ecf2

9 files changed

+10
-109
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
@@ -35,4 +35,4 @@
3535
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
3636
- shell: |
3737
#!/usr/local/bin/runbld --redirect-stderr
38-
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructivePackagingTest
38+
./.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
@@ -28,4 +28,4 @@
2828
JAVA16_HOME=$HOME/.java/openjdk16
2929
- shell: |
3030
#!/usr/local/bin/runbld --redirect-stderr
31-
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v$BWC_VERSION
31+
./.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/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml

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

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@
5151
JAVA16_HOME=$HOME/.java/openjdk16
5252
- shell: |
5353
#!/usr/local/bin/runbld --redirect-stderr
54-
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION
54+
./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ 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\"

.ci/scripts/packaging-test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ if [ -f "/etc/os-release" ] ; then
3737
if [[ "$ID" == "debian" || "$ID_LIKE" == "debian" ]] ; then
3838
# FIXME: The base image should not have rpm installed
3939
sudo rm -Rf /usr/bin/rpm
40+
# Work around incorrect lintian version
41+
# https://github.com/elastic/elasticsearch/issues/48573
42+
if [ $VERSION_ID == 10 ] ; then
43+
sudo apt-get install -y --allow-downgrades lintian=2.15.0
44+
fi
4045
fi
4146
else
4247
cat /etc/issue || true

0 commit comments

Comments
 (0)