From 628be3e03e2568c38a9746d817855f2c081eca2b Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 8 Jul 2024 17:51:22 -0400 Subject: [PATCH 1/2] Switch from C54xlarge Windows Docker Builder to M54xlarge Signed-off-by: Peter Zhu --- jenkins/docker/docker-build.jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/docker/docker-build.jenkinsfile b/jenkins/docker/docker-build.jenkinsfile index b3f43e02f1..8c802c6e1a 100644 --- a/jenkins/docker/docker-build.jenkinsfile +++ b/jenkins/docker/docker-build.jenkinsfile @@ -19,7 +19,7 @@ def docker_args = [ def agent_nodes = [ "linux": "Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder", - "windows": "Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Builder", + "windows": "Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Builder", ] pipeline { From 0a3ebd4036521e2d3fdc04b4d6fc217a06caaf6e Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 8 Jul 2024 18:01:34 -0400 Subject: [PATCH 2/2] Add fpm fix with gem install public_suffix -v 5.1.1 Signed-off-by: Peter Zhu --- ...lmalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ci/dockerfiles/current/build.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/build.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile index 4e148b2ef1..a8ca5ed47d 100644 --- a/docker/ci/dockerfiles/current/build.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/build.almalinux8.opensearch-dashboards.x64.arm64.ppc64le.dockerfile @@ -80,7 +80,7 @@ USER $CONTAINER_USER WORKDIR $CONTAINER_USER_HOME # Install fpm for opensearch dashboards core -RUN gem install dotenv -v 2.8.1 && gem install fpm -v 1.14.2 +RUN gem install dotenv -v 2.8.1 && gem install public_suffix -v 5.1.1 && gem install fpm -v 1.14.2 ENV PATH=$CONTAINER_USER_HOME/.gem/gems/fpm-1.14.2/bin:$PATH # Hard code node version and yarn version for now