ソースを参照

Remove duplicate packaging test scripts

Mark Vieira 3 年 前
コミット
2a13a2b7fd

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

@@ -35,4 +35,4 @@
             RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructivePackagingTest
+          ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructivePackagingTest

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

@@ -28,4 +28,4 @@
             JAVA16_HOME=$HOME/.java/openjdk16
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v$BWC_VERSION
+          ./.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

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

@@ -49,4 +49,4 @@
             RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ $PACKAGING_TASK
+          ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ $PACKAGING_TASK

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

@@ -59,4 +59,4 @@
             RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ $PACKAGING_TASK
+          ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ $PACKAGING_TASK

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

@@ -51,4 +51,4 @@
             JAVA16_HOME=$HOME/.java/openjdk16
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          ./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION
+          ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION

+ 0 - 32
.ci/os.ps1

@@ -1,32 +0,0 @@
-param($GradleTasks='destructiveDistroTest')
-
-If (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator))
-{
-    # Relaunch as an elevated process:
-    Start-Process powershell.exe "-File",('"{0}"' -f $MyInvocation.MyCommand.Path) -Verb RunAs
-    exit
-}
-
-$AppProps = ConvertFrom-StringData (Get-Content .ci/java-versions.properties -raw)
-$env:ES_BUILD_JAVA=$AppProps.ES_BUILD_JAVA
-$env:ES_RUNTIME_JAVA=$AppProps.ES_RUNTIME_JAVA
-
-$ErrorActionPreference="Stop"
-$gradleInit = "C:\Users\$env:username\.gradle\init.d\"
-echo "Remove $gradleInit"
-Remove-Item -Recurse -Force $gradleInit -ErrorAction Ignore
-New-Item -ItemType directory -Path $gradleInit
-echo "Copy .ci/init.gradle to $gradleInit"
-Copy-Item .ci/init.gradle -Destination $gradleInit
-
-[Environment]::SetEnvironmentVariable("JAVA_HOME", $null, "Machine")
-$env:PATH="C:\Users\jenkins\.java\$env:ES_BUILD_JAVA\bin\;$env:PATH"
-$env:JAVA_HOME=$null
-$env:SYSTEM_JAVA_HOME="C:\Users\jenkins\.java\$env:ES_RUNTIME_JAVA"
-Remove-Item -Recurse -Force \tmp -ErrorAction Ignore
-New-Item -ItemType directory -Path \tmp
-
-$ErrorActionPreference="Continue"
-& .\gradlew.bat -g "C:\Users\$env:username\.gradle" --parallel --no-daemon --scan --console=plain $GradleTasks
-
-exit $LastExitCode

+ 0 - 71
.ci/os.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# opensuse 15 has a missing dep for systemd
-
-if which zypper > /dev/null ; then
-    sudo zypper install -y insserv-compat
-fi
-
-if [ -e /etc/sysctl.d/99-gce.conf ]; then
-  # The GCE defaults disable IPv4 forwarding, which breaks the Docker
-  # build. Workaround this by renaming the file so that it is executed
-  # earlier than our own overrides.
-  #
-  # This ultimately needs to be fixed at the image level - see infra
-  # issue 15654.
-  sudo mv /etc/sysctl.d/99-gce.conf /etc/sysctl.d/98-gce.conf
-fi
-
-# Required by bats
-sudo touch /etc/is_vagrant_vm
-sudo useradd vagrant
-
-set -e
-
-. .ci/java-versions.properties
-RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
-BUILD_JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
-
-rm -Rfv $HOME/.gradle/init.d/ && mkdir -p $HOME/.gradle/init.d
-cp -v .ci/init.gradle $HOME/.gradle/init.d
-
-unset JAVA_HOME
-
-if [ -f "/etc/os-release" ] ; then
-    cat /etc/os-release
-    . /etc/os-release
-    if [[ "$ID" == "debian" || "$ID_LIKE" == "debian" ]] ; then
-        # FIXME: The base image should not have rpm installed
-        sudo rm -Rf /usr/bin/rpm
-        # Work around incorrect lintian version
-        #  https://github.com/elastic/elasticsearch/issues/48573
-        if [ $VERSION_ID == 10 ] ; then
-            sudo apt-get install -y --allow-downgrades lintian=2.15.0
-        fi
-    fi
-else
-    cat /etc/issue || true
-fi
-
-sudo bash -c 'cat > /etc/sudoers.d/elasticsearch_vars'  << SUDOERS_VARS
-    Defaults   env_keep += "ES_JAVA_HOME"
-    Defaults   env_keep += "JAVA_HOME"
-    Defaults   env_keep += "SYSTEM_JAVA_HOME"
-SUDOERS_VARS
-sudo chmod 0440 /etc/sudoers.d/elasticsearch_vars
-
-# Bats tests still use this locationa
-sudo rm -Rf /elasticsearch
-sudo mkdir -p /elasticsearch/qa/ && sudo chown jenkins /elasticsearch/qa/ && ln -s $PWD/qa/vagrant /elasticsearch/qa/
-
-# sudo sets it's own PATH thus we use env to override that and call sudo annother time so we keep the secure root PATH
-# run with --continue to run both bats and java tests even if one fails
-# be explicit about Gradle home dir so we use the same even with sudo
-sudo -E env \
-  PATH=$BUILD_JAVA_HOME/bin:`sudo bash -c 'echo -n $PATH'` \
-  RUNTIME_JAVA_HOME=`readlink -f -n $RUNTIME_JAVA_HOME` \
-  --unset=ES_JAVA_HOME \
-  --unset=JAVA_HOME \
-  SYSTEM_JAVA_HOME=`readlink -f -n $RUNTIME_JAVA_HOME` \
-  ./gradlew -g $HOME/.gradle --scan --parallel --continue $@
-

+ 0 - 1
.ci/scripts/packaging-test.ps1

@@ -10,7 +10,6 @@ If (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent
 $AppProps = ConvertFrom-StringData (Get-Content .ci/java-versions.properties -raw)
 $env:ES_BUILD_JAVA=$AppProps.ES_BUILD_JAVA
 $env:ES_RUNTIME_JAVA=$AppProps.ES_RUNTIME_JAVA
-$env:JAVA_TOOL_OPTIONS=''
 
 $ErrorActionPreference="Stop"
 $gradleInit = "C:\Users\$env:username\.gradle\init.d\"

+ 5 - 0
.ci/scripts/packaging-test.sh

@@ -37,6 +37,11 @@ if [ -f "/etc/os-release" ] ; then
     if [[ "$ID" == "debian" || "$ID_LIKE" == "debian" ]] ; then
         # FIXME: The base image should not have rpm installed
         sudo rm -Rf /usr/bin/rpm
+        # Work around incorrect lintian version
+        #  https://github.com/elastic/elasticsearch/issues/48573
+        if [ $VERSION_ID == 10 ] ; then
+            sudo apt-get install -y --allow-downgrades lintian=2.15.0
+        fi
     fi
 else
     cat /etc/issue || true