set IS_PIPELINE_JOB in intake jobs (#45850)
* set IS_PIPELINE_JOB in intake jobs * firefox smoke doesn't get an initial build * firefox smoke doesn't get an initial build (oss edition) * re-enable all jobs
This commit is contained in:
parent
a204a4347f
commit
b1a01effa8
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
|
@ -105,7 +105,6 @@ def getPostBuildWorker(name, closure) {
|
||||||
"TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
|
"TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
|
||||||
"TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
|
"TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
|
||||||
"TEST_ES_TRANSPORT_PORT=${esTransportPort}",
|
"TEST_ES_TRANSPORT_PORT=${esTransportPort}",
|
||||||
"IS_PIPELINE_JOB=1",
|
|
||||||
]) {
|
]) {
|
||||||
closure()
|
closure()
|
||||||
}
|
}
|
||||||
|
@ -168,6 +167,7 @@ def jobRunner(label, closure) {
|
||||||
|
|
||||||
withEnv([
|
withEnv([
|
||||||
"CI=true",
|
"CI=true",
|
||||||
|
"IS_PIPELINE_JOB=1",
|
||||||
"HOME=${env.JENKINS_HOME}",
|
"HOME=${env.JENKINS_HOME}",
|
||||||
"PR_SOURCE_BRANCH=${env.ghprbSourceBranch ?: ''}",
|
"PR_SOURCE_BRANCH=${env.ghprbSourceBranch ?: ''}",
|
||||||
"PR_TARGET_BRANCH=${env.ghprbTargetBranch ?: ''}",
|
"PR_TARGET_BRANCH=${env.ghprbTargetBranch ?: ''}",
|
||||||
|
|
|
@ -8,19 +8,11 @@ else
|
||||||
source src/dev/ci_setup/setup_env.sh
|
source src/dev/ci_setup/setup_env.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
node scripts/build --debug --oss;
|
||||||
node scripts/build --debug --oss;
|
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-oss-*-linux-x86_64.tar.gz')"
|
||||||
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-oss-*-linux-x86_64.tar.gz')"
|
installDir="$PARENT_DIR/install/kibana"
|
||||||
installDir="$PARENT_DIR/install/kibana"
|
mkdir -p "$installDir"
|
||||||
mkdir -p "$installDir"
|
tar -xzf "$linuxBuild" -C "$installDir" --strip=1
|
||||||
tar -xzf "$linuxBuild" -C "$installDir" --strip=1
|
|
||||||
else
|
|
||||||
installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
|
|
||||||
destDir=${installDir}-${CI_WORKER_NUMBER}
|
|
||||||
cp -R "$installDir" "$destDir"
|
|
||||||
|
|
||||||
export KIBANA_INSTALL_DIR="$destDir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export TEST_BROWSER_HEADLESS=1
|
export TEST_BROWSER_HEADLESS=1
|
||||||
|
|
||||||
|
|
|
@ -8,20 +8,12 @@ else
|
||||||
source src/dev/ci_setup/setup_env.sh
|
source src/dev/ci_setup/setup_env.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$IS_PIPELINE_JOB" ]] ; then
|
node scripts/build --debug --no-oss;
|
||||||
node scripts/build --debug --no-oss;
|
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
|
||||||
linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
|
installDir="$PARENT_DIR/install/kibana"
|
||||||
installDir="$PARENT_DIR/install/kibana"
|
mkdir -p "$installDir"
|
||||||
mkdir -p "$installDir"
|
tar -xzf "$linuxBuild" -C "$installDir" --strip=1
|
||||||
tar -xzf "$linuxBuild" -C "$installDir" --strip=1
|
export KIBANA_INSTALL_DIR="$installDir"
|
||||||
export KIBANA_INSTALL_DIR="$installDir"
|
|
||||||
else
|
|
||||||
installDir="$PARENT_DIR/install/kibana"
|
|
||||||
destDir="${installDir}-${CI_WORKER_NUMBER}"
|
|
||||||
cp -R "$installDir" "$destDir"
|
|
||||||
|
|
||||||
export KIBANA_INSTALL_DIR="$destDir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export TEST_BROWSER_HEADLESS=1
|
export TEST_BROWSER_HEADLESS=1
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue