From 03440ebb60863c9ea9c9070cf183fc8566c6baaf Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 17 Apr 2019 14:21:21 -0700 Subject: [PATCH 1/7] Add tar to the test dependencies --- release/preview/opensuse423/test-deps/docker/Dockerfile | 1 + release/stable/opensuse423/test-deps/docker/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/release/preview/opensuse423/test-deps/docker/Dockerfile b/release/preview/opensuse423/test-deps/docker/Dockerfile index f93f06402..4fc78d63f 100644 --- a/release/preview/opensuse423/test-deps/docker/Dockerfile +++ b/release/preview/opensuse423/test-deps/docker/Dockerfile @@ -7,6 +7,7 @@ FROM ${BaseImage} RUN zypper --non-interactive update --skip-interactive \ && zypper --non-interactive install \ sudo \ + tar \ # clean package manager cache && zypper clean -a \ # remove package manager log file diff --git a/release/stable/opensuse423/test-deps/docker/Dockerfile b/release/stable/opensuse423/test-deps/docker/Dockerfile index f93f06402..4fc78d63f 100644 --- a/release/stable/opensuse423/test-deps/docker/Dockerfile +++ b/release/stable/opensuse423/test-deps/docker/Dockerfile @@ -7,6 +7,7 @@ FROM ${BaseImage} RUN zypper --non-interactive update --skip-interactive \ && zypper --non-interactive install \ sudo \ + tar \ # clean package manager cache && zypper clean -a \ # remove package manager log file From 510d8077e1999c06a77a1896ad619f3dee4372a5 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 17 Apr 2019 14:42:54 -0700 Subject: [PATCH 2/7] Add missing dependencies to OpenSUSE and fix tests --- release/preview/opensuse423/test-deps/docker/Dockerfile | 3 +++ release/stable/opensuse423/test-deps/docker/Dockerfile | 3 +++ tests/container.tests.ps1 | 4 ++-- tests/containerTestCommon.psm1 | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/release/preview/opensuse423/test-deps/docker/Dockerfile b/release/preview/opensuse423/test-deps/docker/Dockerfile index 4fc78d63f..66b31a398 100644 --- a/release/preview/opensuse423/test-deps/docker/Dockerfile +++ b/release/preview/opensuse423/test-deps/docker/Dockerfile @@ -8,6 +8,9 @@ RUN zypper --non-interactive update --skip-interactive \ && zypper --non-interactive install \ sudo \ tar \ + curl \ + wget \ + hostname \ # clean package manager cache && zypper clean -a \ # remove package manager log file diff --git a/release/stable/opensuse423/test-deps/docker/Dockerfile b/release/stable/opensuse423/test-deps/docker/Dockerfile index 4fc78d63f..66b31a398 100644 --- a/release/stable/opensuse423/test-deps/docker/Dockerfile +++ b/release/stable/opensuse423/test-deps/docker/Dockerfile @@ -8,6 +8,9 @@ RUN zypper --non-interactive update --skip-interactive \ && zypper --non-interactive install \ sudo \ tar \ + curl \ + wget \ + hostname \ # clean package manager cache && zypper clean -a \ # remove package manager log file diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1 index c4c254001..eb0eec3a8 100644 --- a/tests/container.tests.ps1 +++ b/tests/container.tests.ps1 @@ -319,7 +319,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' { BeforeAll{ #apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps $commands = @( - 'locale-gen' + #'locale-gen' 'update-ca-certificates' 'openssl' 'less' @@ -358,7 +358,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' { BeforeAll{ #apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps $commands = @( - @{command = 'adduser'} + #@{command = 'adduser'} @{command = 'bash'} @{command = 'curl'} @{command = 'find'} diff --git a/tests/containerTestCommon.psm1 b/tests/containerTestCommon.psm1 index 2e64f768b..403241fbf 100644 --- a/tests/containerTestCommon.psm1 +++ b/tests/containerTestCommon.psm1 @@ -408,7 +408,7 @@ function Get-DockerCommandSource $runParams += '-nologo' $runParams += '-noprofile' $runParams += '-c' - $runParams += "(Get-Command -name '$Command' -CommandType '$CommandType').Source" + $runParams += "(Get-Command -name '$Command' -CommandType '$CommandType' -ErrorAction Ignore).Source" return Invoke-Docker -Command run -Params $runParams -SuppressHostOutput -PassThru } From aafb4c490690adab4aaca217bbda0d2010719b9e Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Apr 2019 15:46:32 -0700 Subject: [PATCH 3/7] fix images --- release/preview/centos7/docker/Dockerfile | 9 ++++++--- release/preview/centos7/test-deps/docker/Dockerfile | 4 +++- release/preview/fedora28/docker/Dockerfile | 9 +++++---- release/preview/fedora28/test-deps/docker/Dockerfile | 8 +++++++- release/stable/centos7/docker/Dockerfile | 9 ++++++--- release/stable/centos7/test-deps/docker/Dockerfile | 4 +++- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile index 18088f282..453e51296 100644 --- a/release/preview/centos7/docker/Dockerfile +++ b/release/preview/centos7/docker/Dockerfile @@ -24,9 +24,12 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ # Update now that we have epel-release && yum update -y \ # Install libraries for NTLM support - && yum install -y gssntlmssp \ - # less is required for help in powershell - less \ + && yum install -y \ + gssntlmssp \ + # less is required for help in powershell + less \ + ca-certificates \ + openssl \ && yum upgrade-minimal -y --security \ && yum clean all \ && localedef --charmap=UTF-8 --inputfile=en_US $LANG \ diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile index 956e7898f..362e6266d 100644 --- a/release/preview/centos7/test-deps/docker/Dockerfile +++ b/release/preview/centos7/test-deps/docker/Dockerfile @@ -4,7 +4,9 @@ ARG BaseImage=mcr.microsoft.com/powershell:centos-7 FROM ${BaseImage} # Install dependencies and clean up -RUN yum install -y sudo \ +RUN yum install -y \ + sudo \ + wget \ && yum clean all # Define args needed only for the labels diff --git a/release/preview/fedora28/docker/Dockerfile b/release/preview/fedora28/docker/Dockerfile index e62e85f04..b1b9705ac 100644 --- a/release/preview/fedora28/docker/Dockerfile +++ b/release/preview/fedora28/docker/Dockerfile @@ -20,13 +20,14 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ && dnf install -y /tmp/powershell.rpm \ && dnf install -y \ - # less is needed for help - less \ + # less is needed for help + less \ # Needed to run localdef glibc-locale-source \ # Invoke-WebRequest doesn't work correctly without this - compat-openssl10 \ - gssntlmssp \ + compat-openssl10 \ + ca-certificates \ + gssntlmssp \ && dnf upgrade-minimal -y --security \ && dnf clean all \ && localedef --charmap=UTF-8 --inputfile=en_US $LANG \ diff --git a/release/preview/fedora28/test-deps/docker/Dockerfile b/release/preview/fedora28/test-deps/docker/Dockerfile index afb0574ee..d5a9153ec 100644 --- a/release/preview/fedora28/test-deps/docker/Dockerfile +++ b/release/preview/fedora28/test-deps/docker/Dockerfile @@ -4,7 +4,13 @@ ARG BaseImage=mcr.microsoft.com/powershell:fedora-28 FROM ${BaseImage} # Install dependencies and clean up -RUN dnf install -y sudo \ +RUN dnf install -y \ + sudo \ + findutils \ + hostname \ + iputils \ + wget \ + procps-ng \ && dnf clean all # Define args needed only for the labels diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile index b3c87822a..22b4ff520 100644 --- a/release/stable/centos7/docker/Dockerfile +++ b/release/stable/centos7/docker/Dockerfile @@ -24,9 +24,12 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ # Update now that we have epel-release && yum update -y \ # Install libraries for NTLM support - && yum install -y gssntlmssp \ - # less is required for help in powershell - less \ + && yum install -y \ + gssntlmssp \ + # less is required for help in powershell + less \ + ca-certificates \ + openssl \ && yum upgrade-minimal -y --security \ && yum clean all \ && localedef --charmap=UTF-8 --inputfile=en_US $LANG \ diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile index 956e7898f..362e6266d 100644 --- a/release/stable/centos7/test-deps/docker/Dockerfile +++ b/release/stable/centos7/test-deps/docker/Dockerfile @@ -4,7 +4,9 @@ ARG BaseImage=mcr.microsoft.com/powershell:centos-7 FROM ${BaseImage} # Install dependencies and clean up -RUN yum install -y sudo \ +RUN yum install -y \ + sudo \ + wget \ && yum clean all # Define args needed only for the labels From a8e549af97dcd7aa62d56e712b16bd66f043e9d9 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Apr 2019 15:47:03 -0700 Subject: [PATCH 4/7] fix a few containers --- release/preview/alpine/test-deps/docker/Dockerfile | 7 ++++++- release/preview/centos7/docker/Dockerfile | 2 -- release/preview/centos7/test-deps/docker/Dockerfile | 1 + release/preview/ubuntu16.04/test-deps/docker/Dockerfile | 4 ++++ release/preview/ubuntu18.04/test-deps/docker/Dockerfile | 4 ++++ release/stable/alpine/test-deps/docker/Dockerfile | 7 ++++++- release/stable/centos7/docker/Dockerfile | 2 -- release/stable/centos7/test-deps/docker/Dockerfile | 1 + release/stable/ubuntu16.04/test-deps/docker/Dockerfile | 4 ++++ release/stable/ubuntu18.04/test-deps/docker/Dockerfile | 4 ++++ tests/container.tests.ps1 | 4 ++-- 11 files changed, 32 insertions(+), 8 deletions(-) diff --git a/release/preview/alpine/test-deps/docker/Dockerfile b/release/preview/alpine/test-deps/docker/Dockerfile index 718bb68cc..ec5c6851e 100644 --- a/release/preview/alpine/test-deps/docker/Dockerfile +++ b/release/preview/alpine/test-deps/docker/Dockerfile @@ -17,7 +17,12 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION} RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ - && apk add bash sudo shadow \ + && apk add \ + bash \ + sudo \ + shadow \ + openssl \ + curl \ && apk del .pipeline-deps \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile index 453e51296..165c4829c 100644 --- a/release/preview/centos7/docker/Dockerfile +++ b/release/preview/centos7/docker/Dockerfile @@ -28,8 +28,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ gssntlmssp \ # less is required for help in powershell less \ - ca-certificates \ - openssl \ && yum upgrade-minimal -y --security \ && yum clean all \ && localedef --charmap=UTF-8 --inputfile=en_US $LANG \ diff --git a/release/preview/centos7/test-deps/docker/Dockerfile b/release/preview/centos7/test-deps/docker/Dockerfile index 362e6266d..b44beb0a8 100644 --- a/release/preview/centos7/test-deps/docker/Dockerfile +++ b/release/preview/centos7/test-deps/docker/Dockerfile @@ -7,6 +7,7 @@ FROM ${BaseImage} RUN yum install -y \ sudo \ wget \ + openssl \ && yum clean all # Define args needed only for the labels diff --git a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile index 47525e4df..d279be2b2 100644 --- a/release/preview/ubuntu16.04/test-deps/docker/Dockerfile +++ b/release/preview/ubuntu16.04/test-deps/docker/Dockerfile @@ -7,6 +7,10 @@ FROM ${BaseImage} RUN apt-get update \ && apt-get install -y \ sudo \ + curl \ + wget \ + iputils-ping \ + iputils-tracepath \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile index 258542433..e899e02eb 100644 --- a/release/preview/ubuntu18.04/test-deps/docker/Dockerfile +++ b/release/preview/ubuntu18.04/test-deps/docker/Dockerfile @@ -7,6 +7,10 @@ FROM ${BaseImage} RUN apt-get update \ && apt-get install -y \ sudo \ + curl \ + wget \ + iputils-ping \ + iputils-tracepath \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/release/stable/alpine/test-deps/docker/Dockerfile b/release/stable/alpine/test-deps/docker/Dockerfile index 718bb68cc..ec5c6851e 100644 --- a/release/stable/alpine/test-deps/docker/Dockerfile +++ b/release/stable/alpine/test-deps/docker/Dockerfile @@ -17,7 +17,12 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION} RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \ - && apk add bash sudo shadow \ + && apk add \ + bash \ + sudo \ + shadow \ + openssl \ + curl \ && apk del .pipeline-deps \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile index 22b4ff520..7b8d4cc6e 100644 --- a/release/stable/centos7/docker/Dockerfile +++ b/release/stable/centos7/docker/Dockerfile @@ -28,8 +28,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ gssntlmssp \ # less is required for help in powershell less \ - ca-certificates \ - openssl \ && yum upgrade-minimal -y --security \ && yum clean all \ && localedef --charmap=UTF-8 --inputfile=en_US $LANG \ diff --git a/release/stable/centos7/test-deps/docker/Dockerfile b/release/stable/centos7/test-deps/docker/Dockerfile index 362e6266d..b44beb0a8 100644 --- a/release/stable/centos7/test-deps/docker/Dockerfile +++ b/release/stable/centos7/test-deps/docker/Dockerfile @@ -7,6 +7,7 @@ FROM ${BaseImage} RUN yum install -y \ sudo \ wget \ + openssl \ && yum clean all # Define args needed only for the labels diff --git a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile index 47525e4df..d279be2b2 100644 --- a/release/stable/ubuntu16.04/test-deps/docker/Dockerfile +++ b/release/stable/ubuntu16.04/test-deps/docker/Dockerfile @@ -7,6 +7,10 @@ FROM ${BaseImage} RUN apt-get update \ && apt-get install -y \ sudo \ + curl \ + wget \ + iputils-ping \ + iputils-tracepath \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile index 258542433..e899e02eb 100644 --- a/release/stable/ubuntu18.04/test-deps/docker/Dockerfile +++ b/release/stable/ubuntu18.04/test-deps/docker/Dockerfile @@ -7,6 +7,10 @@ FROM ${BaseImage} RUN apt-get update \ && apt-get install -y \ sudo \ + curl \ + wget \ + iputils-ping \ + iputils-tracepath \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/tests/container.tests.ps1 b/tests/container.tests.ps1 index eb0eec3a8..1396874b3 100644 --- a/tests/container.tests.ps1 +++ b/tests/container.tests.ps1 @@ -320,8 +320,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' { #apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps $commands = @( #'locale-gen' - 'update-ca-certificates' - 'openssl' + # debian 'update-ca-certificates' 'less' ) @@ -369,6 +368,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' { @{command = 'sudo'} @{command = 'tar'} @{command = 'wget'} + @{command = 'openssl'} ) $debianCommands = @( From 3ce0245b5a61dd51c92d7c6fd7352b6c7e0c63b5 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 18 Apr 2019 11:05:26 -0700 Subject: [PATCH 5/7] fix test failures --- .../amazonlinux/test-deps/docker/Dockerfile | 5 +++++ release/preview/debian9/test-deps/docker/Dockerfile | 5 +++++ release/stable/debian9/test-deps/docker/Dockerfile | 5 +++++ release/stable/fedora28/test-deps/docker/Dockerfile | 8 +++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile index 694c4384c..cd2e95762 100644 --- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile +++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile @@ -18,6 +18,11 @@ RUN \ sudo \ # add su util-linux \ + iputils \ + hostname \ + procps \ + wget \ + openssl \ && yum clean all \ # remove cache folders and files && rm -rf /var/cache/yum diff --git a/release/preview/debian9/test-deps/docker/Dockerfile b/release/preview/debian9/test-deps/docker/Dockerfile index 4868f6760..33ce0f7d3 100644 --- a/release/preview/debian9/test-deps/docker/Dockerfile +++ b/release/preview/debian9/test-deps/docker/Dockerfile @@ -7,6 +7,11 @@ FROM ${BaseImage} RUN apt-get update \ && apt-get install -y \ sudo \ + curl \ + wget \ + iputils-ping \ + iputils-tracepath \ + procps \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/release/stable/debian9/test-deps/docker/Dockerfile b/release/stable/debian9/test-deps/docker/Dockerfile index c71aec48a..50db06b5a 100644 --- a/release/stable/debian9/test-deps/docker/Dockerfile +++ b/release/stable/debian9/test-deps/docker/Dockerfile @@ -7,6 +7,11 @@ FROM ${BaseImage} RUN apt-get update \ && apt-get install -y \ sudo \ + curl \ + wget \ + iputils-ping \ + iputils-tracepath \ + procps \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/release/stable/fedora28/test-deps/docker/Dockerfile b/release/stable/fedora28/test-deps/docker/Dockerfile index afb0574ee..d5a9153ec 100644 --- a/release/stable/fedora28/test-deps/docker/Dockerfile +++ b/release/stable/fedora28/test-deps/docker/Dockerfile @@ -4,7 +4,13 @@ ARG BaseImage=mcr.microsoft.com/powershell:fedora-28 FROM ${BaseImage} # Install dependencies and clean up -RUN dnf install -y sudo \ +RUN dnf install -y \ + sudo \ + findutils \ + hostname \ + iputils \ + wget \ + procps-ng \ && dnf clean all # Define args needed only for the labels From 85cfcc058829e9954bda8aad7c95a3431267b63f Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 18 Apr 2019 11:18:50 -0700 Subject: [PATCH 6/7] ignore nanoserver errors for now --- vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vsts-ci.yml b/vsts-ci.yml index fde5cdbde..b2436644f 100644 --- a/vsts-ci.yml +++ b/vsts-ci.yml @@ -145,6 +145,7 @@ jobs: vmImage: vs2017-win2016 preview: false ciParameter: '-CI' + continueonerror: true # Use the TagFilter to filter to 1809 because the docker instance inside the agent only supports 1809 - template: .vsts-ci/phase.yml From 1e5bda0fcc6f11ada75e58e913849b590b93862e Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 18 Apr 2019 11:19:08 -0700 Subject: [PATCH 7/7] add tar to amazon Linux test-deps --- release/community-stable/amazonlinux/test-deps/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile index cd2e95762..16239e14e 100644 --- a/release/community-stable/amazonlinux/test-deps/docker/Dockerfile +++ b/release/community-stable/amazonlinux/test-deps/docker/Dockerfile @@ -23,6 +23,7 @@ RUN \ procps \ wget \ openssl \ + tar \ && yum clean all \ # remove cache folders and files && rm -rf /var/cache/yum