16306: Rename arvados-dev buildpackage -> arvados-package build

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/cmd/arvados-dev/buildpackage.go b/cmd/arvados-package/build.go
similarity index 96%
rename from cmd/arvados-dev/buildpackage.go
rename to cmd/arvados-package/build.go
index a24fa47c915e92dd039f8265f516d26fe0615553..1343ca77bc36dda02210e1ac71829eff73851c33 100644 (file)
--- a/cmd/arvados-dev/buildpackage.go
+++ b/cmd/arvados-package/build.go
@@ -17,9 +17,9 @@ import (
        "github.com/sirupsen/logrus"
 )
 
-type buildPackage struct{}
+type build struct{}
 
-func (bld buildPackage) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+func (bld build) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
        logger := ctxlog.New(stderr, "text", "info")
        err := (&builder{
                PackageVersion: "0.0.0",

diff --git a/cmd/arvados-dev/buildpackage_test.go b/cmd/arvados-package/build_test.go
similarity index 86%
rename from cmd/arvados-dev/buildpackage_test.go
rename to cmd/arvados-package/build_test.go
index 61bdeae82feedac1ecd645163bd92f2aa08aff56..abb54532d0bd7b4375d8f3dfb78febcd64357ffb 100644 (file)
--- a/cmd/arvados-dev/buildpackage_test.go
+++ b/cmd/arvados-package/build_test.go
@@ -27,13 +27,13 @@ func init() {
        flag.StringVar(&buildimage, "test.buildimage", "debian:10", "docker image to use when running buildpackage")
 }
 
-type BuildpackageSuite struct{}
+type BuildSuite struct{}
 
-var _ = check.Suite(&BuildpackageSuite{})
+var _ = check.Suite(&BuildSuite{})
 
 func Test(t *testing.T) { check.TestingT(t) }
 
-func (s *BuildpackageSuite) TestBuildAndInstall(c *check.C) {
+func (s *BuildSuite) TestBuildAndInstall(c *check.C) {
        if testing.Short() {
                c.Skip("skipping docker tests in short mode")
        } else if _, err := exec.Command("docker", "info").CombinedOutput(); err != nil {
@@ -59,10 +59,10 @@ func (s *BuildpackageSuite) TestBuildAndInstall(c *check.C) {
 
        cmd = exec.Command("docker", "run", "--rm",
                "-v", tmpdir+"/pkg:/pkg",
-               "-v", tmpdir+"/bin/arvados-dev:/arvados-dev:ro",
+               "-v", tmpdir+"/bin/arvados-package:/arvados-package:ro",
                "-v", srctree+":/usr/local/src/arvados:ro",
                buildimage,
-               "/arvados-dev", "buildpackage",
+               "/arvados-package", "build",
                "-package-version", "0.9.99",
                "-source", "/usr/local/src/arvados",
                "-output-directory", "/pkg")
@@ -71,7 +71,7 @@ func (s *BuildpackageSuite) TestBuildAndInstall(c *check.C) {
        err = cmd.Run()
        c.Assert(err, check.IsNil)
 
-       fi, err := os.Stat(tmpdir + "/pkg/arvados-server_0.9.99_amd64.deb")
+       fi, err := os.Stat(tmpdir + "/pkg/arvados-server-easy_0.9.99_amd64.deb")
        c.Assert(err, check.IsNil)
        c.Logf("%#v", fi)
 }

diff --git a/cmd/arvados-dev/cmd.go b/cmd/arvados-package/cmd.go
similarity index 92%
rename from cmd/arvados-dev/cmd.go
rename to cmd/arvados-package/cmd.go
index e0d5144e575e55b05d5ab16f1f0b6cf31df7b738..02bc16cea8f62869dfb4a7a66f87402eba903978 100644 (file)
--- a/cmd/arvados-dev/cmd.go
+++ b/cmd/arvados-package/cmd.go
@@ -16,7 +16,7 @@ var (
                "-version":  cmd.Version,
                "--version": cmd.Version,
 
-               "buildpackage": buildPackage{},
+               "build": build{},
        })
 )
 

diff --git a/cmd/arvados-dev/docker-boot.sh b/cmd/arvados-package/docker-boot.sh
similarity index 100%
rename from cmd/arvados-dev/docker-boot.sh
rename to cmd/arvados-package/docker-boot.sh

diff --git a/cmd/arvados-dev/docker-build-install.sh b/cmd/arvados-package/docker-build-install.sh
similarity index 92%
rename from cmd/arvados-dev/docker-build-install.sh
rename to cmd/arvados-package/docker-build-install.sh
index 966318b94c204406f3813727151842bd08ba91b9..4fdcccbcee024a32dcda20383c8109f2a4f690ab 100755 (executable)
--- a/cmd/arvados-dev/docker-build-install.sh
+++ b/cmd/arvados-package/docker-build-install.sh
@@ -51,7 +51,7 @@ osbase=${opts[os]:-debian:10}
 
 mkdir -p /tmp/pkg
 
-buildimage=arvados-buildpackage-${osbase}
+buildimage=arvados-package-build-${osbase}
 if [[ "${opts[force-buildimage]}" || -z "$(docker images --format {{.Repository}} "${buildimage}")" ]]; then
     (
         echo >&2 building arvados-server...
@@ -81,19 +81,19 @@ pkgfile=/tmp/pkg/arvados-server-easy_${version}_amd64.deb
 rm -v -f "${pkgfile}"
 
 (
-    echo >&2 building arvados-dev...
-    cd cmd/arvados-dev
+    echo >&2 building arvados-package...
+    cd cmd/arvados-package
     go install
 )
 echo >&2 building ${pkgfile}...
 docker run --rm \
        --tmpfs /tmp:exec,mode=01777 \
        -v /tmp/pkg:/pkg \
-       -v "${GOPATH:-${HOME}/go}"/bin/arvados-dev:/arvados-dev:ro \
+       -v "${GOPATH:-${HOME}/go}"/bin/arvados-package:/arvados-package:ro \
        -v "$(pwd)":/arvados:ro \
        "${buildimage}" \
        eatmydata \
-       /arvados-dev buildpackage \
+       /arvados-package build \
        -source /arvados \
        -package-version "${version}" \
        -output-directory /pkg
@@ -119,7 +119,7 @@ if [[ "${opts[force-installimage]}" || -z "$(docker images --format {{.Repositor
            -v ${sourcesfile}:/etc/apt/sources.list.d/arvados-local.list:ro \
            --env DEBIAN_FRONTEND=noninteractive \
            "${osbase}" \
-           bash -c 'apt update && apt install -y eatmydata && eatmydata apt install -y arvados-server-easy postgresql'
+           bash -c 'apt update && apt install -y eatmydata && eatmydata apt install -y arvados-server-easy postgresql && eatmydata apt remove -y arvados-server-easy'
     docker commit "${installctr}" "${installimage}"
     docker rm "${installctr}"
     installctr=