diff --git a/cli/cmd/pack.go b/cli/cmd/pack.go index 2e8ca9a8c..c595372f8 100644 --- a/cli/cmd/pack.go +++ b/cli/cmd/pack.go @@ -118,8 +118,6 @@ func internalPackModule(cmdCtx *cmdcontext.CmdCtx, args []string) error { return pack.PackInDocker(cmdCtx, packCtx, *cliOpts, os.Args) } - fmt.Println("cliOpts", cliOpts.Env) - packer := pack.CreatePacker(packCtx) if packer == nil { return fmt.Errorf("incorrect type of package. Available types: rpm, deb, tgz") diff --git a/cli/cmdcontext/cmdcontext.go b/cli/cmdcontext/cmdcontext.go index 3dcbb46bb..f44768ec8 100644 --- a/cli/cmdcontext/cmdcontext.go +++ b/cli/cmdcontext/cmdcontext.go @@ -34,8 +34,6 @@ type TarantoolCli struct { type TcmCli struct { // Executable is a path to tcm executable. Executable string - // // Tcm version. - // version version.Version } // GetVersion returns and caches the tarantool version. diff --git a/cli/configure/configure.go b/cli/configure/configure.go index 9a1b11ec6..7e3a7b20f 100644 --- a/cli/configure/configure.go +++ b/cli/configure/configure.go @@ -517,6 +517,7 @@ func detectLocalTarantool(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts) er if err != nil { return err } + if _, err := os.Stat(localTarantool); err == nil { if _, err := exec.LookPath(localTarantool); err != nil { return fmt.Errorf(`found Tarantool binary '%s' isn't executable: %s`, @@ -525,7 +526,6 @@ func detectLocalTarantool(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts) er cmdCtx.Cli.TarantoolCli.Executable = localTarantool cmdCtx.Cli.IsTarantoolBinFromRepo = true - } else if !os.IsNotExist(err) { return fmt.Errorf("failed to get access to Tarantool binary file: %s", err) } diff --git a/cli/pack/common.go b/cli/pack/common.go index 56b5960f5..5ca9b65b1 100644 --- a/cli/pack/common.go +++ b/cli/pack/common.go @@ -245,7 +245,6 @@ func copyBinaries(bundleEnvPath string, packCtx *PackCtx, cmdCtx *cmdcontext.Cmd if err := os.MkdirAll(pkgBin, dirPermissions); err != nil { return fmt.Errorf("failed to create binaries directory in bundle: %s", err) } - fmt.Println("cmdCtx.Cli.TarantoolCli.Executable", cmdCtx.Cli.TarantoolCli.Executable) // Copy tarantool. if !packCtx.TarantoolIsSystem || packCtx.WithBinaries { diff --git a/demo/aap1/config.yml b/demo/aap1/config.yml deleted file mode 100644 index e5a8d60b8..000000000 --- a/demo/aap1/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -app: - file: 'init.lua' - -groups: - group001: - replicasets: - replicaset001: - instances: - instance001: - iproto: - listen: - - uri: '127.0.0.1:3301' diff --git a/demo/aap1/init.lua b/demo/aap1/init.lua deleted file mode 100644 index 1cc221d88..000000000 --- a/demo/aap1/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -local app_name = "aap1" - -local log = require('log').new(app_name) -log.info('loaded') diff --git a/demo/aap1/instances.yml b/demo/aap1/instances.yml deleted file mode 100644 index aa60c2fc4..000000000 --- a/demo/aap1/instances.yml +++ /dev/null @@ -1 +0,0 @@ -instance001: diff --git a/demo/app1-0.1.0.0.arm64.tar.gz b/demo/app1-0.1.0.0.arm64.tar.gz deleted file mode 100644 index 45e2fe8da..000000000 Binary files a/demo/app1-0.1.0.0.arm64.tar.gz and /dev/null differ diff --git a/demo/instances.enabled/aap1 b/demo/instances.enabled/aap1 deleted file mode 120000 index 4fe019f70..000000000 --- a/demo/instances.enabled/aap1 +++ /dev/null @@ -1 +0,0 @@ -../aap1 \ No newline at end of file diff --git a/demo/tt.yaml b/demo/tt.yaml deleted file mode 100644 index 623057bc9..000000000 --- a/demo/tt.yaml +++ /dev/null @@ -1,54 +0,0 @@ -modules: - # Directory where the external modules are stored. - directory: [modules] - -env: - # Restart instance on failure. - restart_on_failure: false - - # Directory that stores binary files. - bin_dir: bin - - # Directory that stores Tarantool header files. - inc_dir: include - - # Path to directory that stores all applications. - # The directory can also contain symbolic links to applications. - instances_enabled: instances.enabled - - # Tarantoolctl artifacts layout compatibility: if set to true tt will not create application - # sub-directories for control socket, pid files, log files, etc.. Data files (wal, vinyl, - # snap) and multi-instance applications are not affected by this option. - tarantoolctl_layout: false - -app: - # Directory that stores various instance runtime - # artifacts like console socket, PID file, etc. - run_dir: var/run - - # Directory that stores log files. - log_dir: var/log - - # Directory where write-ahead log (.xlog) files are stored. - wal_dir: var/lib - - # Directory where memtx stores snapshot (.snap) files. - memtx_dir: var/lib - - # Directory where vinyl files or subdirectories will be stored. - vinyl_dir: var/lib - -# Path to file with credentials for downloading Tarantool Enterprise Edition. -# credential_path: /path/to/file -ee: - credential_path: - -templates: - # The path to templates search directory. - - path: templates - -repo: - # Directory where local rocks files could be found. - rocks: - # Directory that stores installation files. - distfiles: distfiles diff --git a/test/integration/pack/test_pack.py b/test/integration/pack/test_pack.py index 593ad5771..b51683c6f 100644 --- a/test/integration/pack/test_pack.py +++ b/test/integration/pack/test_pack.py @@ -801,8 +801,8 @@ def test_pack_tgz_compat_with_binaries(tt_cmd, tmp_path): [tt_cmd, "run"], cwd=app_path, env=dict(os.environ, PWD=app_path)) - # assert rc == 0 - # assert output == "Hello World" + assert rc == 0 + assert output == "Hello World" def test_pack_tgz_multiple_apps_compat(tt_cmd, tmp_path): @@ -993,13 +993,10 @@ def test_pack_tgz_links_to_binaries(tt_cmd, tmp_path): dirs_exist_ok=True) base_dir = tmp_path - path = os.environ.get('PATH') - print(f"PATH1 ==={path}") rc, output = run_command_and_get_output( [tt_cmd, "pack", "tgz"], cwd=base_dir, env=dict(os.environ, PWD=base_dir)) - print(f"PATH2 ==={path}") assert rc == 0