Merge pull request #651 from amazonlinux/buildspec-env-tidy

Tidy buildspecs to use container environment
bottlerocket-os · Jan 15, 2020 · 5feec64 · 5feec64
2 parents e9b8da7 + 2f011e0
commit 5feec64
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git 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/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:

diff --git 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 \