From ec2e4acc993eff4ad2c5377ac44772941f711a13 Mon Sep 17 00:00:00 2001 From: Jacob Vallejo Date: Tue, 14 Jan 2020 17:49:47 -0800 Subject: [PATCH 1/2] ci: remove unused environment variable --- tools/infra/buildspec/thar-pr-build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/infra/buildspec/thar-pr-build.yml b/tools/infra/buildspec/thar-pr-build.yml index 91fba6f681f..5038b9ed12e 100644 --- a/tools/infra/buildspec/thar-pr-build.yml +++ b/tools/infra/buildspec/thar-pr-build.yml @@ -1,10 +1,5 @@ version: 0.2 -env: - variables: - # Path to infra tooling directory. - INFRA_DIR: "./tools/infra" - phases: pre_build: commands: From 2f011e0eb85b8b22e780238a9cd81b5c7721bf0b Mon Sep 17 00:00:00 2001 From: Jacob Vallejo Date: Tue, 14 Jan 2020 17:50:20 -0800 Subject: [PATCH 2/2] ci: add systemd headers in image for test stage --- .../infra/buildspec/thar-develop-pipeline-test.yml | 14 +------------- tools/infra/container/Dockerfile.builder | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/infra/buildspec/thar-develop-pipeline-test.yml b/tools/infra/buildspec/thar-develop-pipeline-test.yml index 30e824d0f06..c40747f74c8 100644 --- a/tools/infra/buildspec/thar-develop-pipeline-test.yml +++ b/tools/infra/buildspec/thar-develop-pipeline-test.yml @@ -1,21 +1,9 @@ version: 0.2 -env: - variables: - # Path to infra tooling directory. - INFRA_DIR: "./tools/infra" - phases: - install: - runtime-versions: - docker: 18 - commands: - - . "${INFRA_DIR}/env/lib/environment-setup" - - . setup-rust-builder - # TODO: rely on libsystemd in build container instead, see #545 - - apt install -y libsystemd-dev pre_build: commands: + - start-build-environment - environment-report - write-build-meta build: diff --git a/tools/infra/container/Dockerfile.builder b/tools/infra/container/Dockerfile.builder index 7b1cb53062a..bc48992bcc2 100644 --- a/tools/infra/container/Dockerfile.builder +++ b/tools/infra/container/Dockerfile.builder @@ -10,7 +10,7 @@ FROM amazonlinux:2 as base RUN yum update -y \ && yum groupinstall -y 'Development Tools' \ - && yum install -y socat procps-ng awscli jq openssh rsync \ + && yum install -y socat procps-ng awscli jq openssh rsync systemd-devel \ && amazon-linux-extras enable docker \ && yum install -y docker amazon-ecr-credential-helper \ && yum clean all \