Re: [PATCH 2/3] ci: refactor docker runner script
- From
Danh Doan <congdanhqx@gmail.com>
- Date
- Mar 29, 2020, 06:36 UTC
- Message-ID
- <20200329063608.GA22082@danh.dev>
- In-Reply-To
- <20200328175329.GD2224@szeder.dev>
On 2020-03-28 18:53:29+0100, SZEDER Gábor <szeder.dev@gmail.com> wrote:
Show 7 quoted lines
> On Thu, Mar 26, 2020 at 02:35:18PM +0700, Đoàn Trần Công Danh wrote: > > We will support alpine check in docker later in this serie. > > > > While we're at it, tell people to run as root in podman. > > Why tell that to people? Please clarify what podman is and why should > we care.
podman is a docker drop-in placement. I use it instead of docker to develop this series.
docker requires a service to be run and user in docker system groups, podman requires neither.
root user in podman is mapped to host user. I run into trouble when develop this series in my local machine.
Show 21 quoted lines
> > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> > ---
> > .travis.yml | 2 +-
> > azure-pipelines.yml | 4 ++--
> > ci/{run-linux32-docker.sh => run-docker.sh} | 19 +++++++++++++------
> > 3 files changed, 16 insertions(+), 9 deletions(-)
> > rename ci/{run-linux32-docker.sh => run-docker.sh} (48%)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index fc5730b085..32e80e2670 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -32,7 +32,7 @@ matrix:
> > services:
> > - docker
> > before_install:
> > - script: ci/run-linux32-docker.sh
> > + script: ci/run-docker.sh linux32
>
> The name of the 'Linux32' build job starts with a capital 'L'; please
> be consistent with that.the old name of the script is run-linux32-docker, I think it's better to rename the job to all lowercase. All other jobs, except Documentation and static analysis are in lowercase.
Show 39 quoted lines
> > > - env: jobname=StaticAnalysis > > os: linux > > compiler: > > diff --git a/azure-pipelines.yml b/azure-pipelines.yml > > index 675c3a43c9..ef504ff29f 100644 > > --- a/azure-pipelines.yml > > +++ b/azure-pipelines.yml > > @@ -489,14 +489,14 @@ jobs: > > test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 > > > > res=0 > > - sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" bash -lxc ci/run-linux32-docker.sh || res=1 > > + sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" bash -lxc ci/run-docker.sh linux32 || res=1 > > > > sudo chmod a+r t/out/TEST-*.xml > > test ! -d t/failed-test-artifacts || sudo chmod a+r t/failed-test-artifacts > > > > test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || res=1 > > exit $res > > - displayName: 'ci/run-linux32-docker.sh' > > + displayName: 'ci/run-docker.sh linux32' > > env: > > GITFILESHAREPWD: $(gitfileshare.pwd) > > - task: PublishTestResults@2 > > diff --git a/ci/run-linux32-docker.sh b/ci/run-docker.sh > > similarity index 48% > > rename from ci/run-linux32-docker.sh > > rename to ci/run-docker.sh > > index 751acfcf8a..c8dff9d41a 100755 > > --- a/ci/run-linux32-docker.sh > > +++ b/ci/run-docker.sh > > @@ -1,15 +1,22 @@ > > #!/bin/sh > > # > > -# Download and run Docker image to build and test 32-bit Git > > +# Download and run Docker image to build and test git > > s/git/Git/
Will change
-- Danh