Skip to content

Commit b784344

Browse files
Merge branch 'master' into rename-investigate-in-resolver-action
2 parents 269b3d5 + 52f8d3a commit b784344

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.ci/es-snapshots/Jenkinsfile_build_es

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node(workers.label('s')) {
28+
node(workers.label('l')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID
@@ -154,9 +154,10 @@ def buildArchives(destination) {
154154
"NODE_NAME=",
155155
]) {
156156
sh """
157-
./gradlew -p distribution/archives assemble --parallel
157+
./gradlew -Dbuild.docker=true assemble --parallel
158158
mkdir -p ${destination}
159-
find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
159+
find distribution -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -not -path *build-context* -exec cp {} ${destination} \\;
160+
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:\${0} | gzip > ${destination}/elasticsearch-\${0}-docker-image.tar.gz'
160161
"""
161162
}
162163
}

x-pack/test/api_integration/apis/fleet/agent_flow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function (providerContext: FtrProviderContext) {
1818
const supertestWithoutAuth = getSupertestWithoutAuth(providerContext);
1919
const esClient = getService('es');
2020

21-
describe('fleet_agent_flow', () => {
21+
describe.skip('fleet_agent_flow', () => {
2222
before(async () => {
2323
await esArchiver.load('empty_kibana');
2424
});

0 commit comments

Comments
 (0)