As we reevaluate how to best support and maintain Staging Ref in the future, we encourage development teams using this environment to highlight their use cases in the following issue: https://gitlab.com/gitlab-com/gl-infra/software-delivery/framework/software-delivery-framework-issue-tracker/-/issues/36.

Skip to content
Snippets Groups Projects
Commit 4a8db75d authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'remove-branch-functionality' into 'master'

Remove branch functionality

The branch functionality is already replaced with rugged inside GitLab

See merge request !52
parents d5020c5c 3739a840
No related branches found
No related tags found
No related merge requests found
v3.0.0
- Remove list-remote-tags command (Robert Schilling)
- Remove rm-tag command (Robert Schilling)
- Remove create-branch and rm-branch commands (Robert Schilling)
v2.7.1
- Add new command to list tags from a remote repo
Loading
Loading
Loading
Loading
@@ -104,14 +104,6 @@ Update HEAD:
./bin/gitlab-projects update-head gitlab/gitlab-ci.git 3-2-stable
Create branch:
./bin/gitlab-projects create-branch gitlab/gitlab-ci.git 3-2-stable master
Remove branch:
./bin/gitlab-projects rm-branch gitlab/gitlab-ci.git 3-0-stable
Create tag (lightweight & annotated):
./bin/gitlab-projects create-tag gitlab/gitlab-ci.git v3.0.0 3-0-stable
Loading
Loading
Loading
Loading
@@ -50,8 +50,6 @@ class GitlabProjects
def exec
case @command
when 'create-branch'; create_branch
when 'rm-branch'; rm_branch
when 'create-tag'; create_tag
when 'add-project'; add_project
when 'list-projects'; puts list_projects
Loading
Loading
@@ -114,19 +112,6 @@ class GitlabProjects
end
end
def create_branch
branch_name = ARGV.shift
ref = ARGV.shift || "HEAD"
cmd = %W(git --git-dir=#{full_path} branch -- #{branch_name} #{ref})
system(*cmd)
end
def rm_branch
branch_name = ARGV.shift
cmd = %W(git --git-dir=#{full_path} branch -D -- #{branch_name})
system(*cmd)
end
def create_tag
tag_name = ARGV.shift
ref = ARGV.shift || "HEAD"
Loading
Loading
Loading
Loading
@@ -68,40 +68,6 @@ describe GitlabProjects do
it { @gl_projects.instance_variable_get(:@full_path).should == "#{GitlabConfig.new.repos_path}/gitlab-ci.git" }
end
describe :create_branch do
let(:gl_projects_create) {
build_gitlab_projects('import-project', repo_name, 'https://github.com/randx/six.git')
}
let(:gl_projects) { build_gitlab_projects('create-branch', repo_name, 'test_branch', 'master') }
it "should create a branch" do
gl_projects_create.exec
gl_projects.exec
branch_ref = capture_in_tmp_repo(%W(git rev-parse test_branch))
master_ref = capture_in_tmp_repo(%W(git rev-parse master))
branch_ref.should == master_ref
end
end
describe :rm_branch do
let(:gl_projects_create) {
build_gitlab_projects('import-project', repo_name, 'https://github.com/randx/six.git')
}
let(:gl_projects_create_branch) {
build_gitlab_projects('create-branch', repo_name, 'test_branch', 'master')
}
let(:gl_projects) { build_gitlab_projects('rm-branch', repo_name, 'test_branch') }
it "should remove a branch" do
gl_projects_create.exec
gl_projects_create_branch.exec
branch_ref = capture_in_tmp_repo(%W(git rev-parse test_branch))
gl_projects.exec
branch_del = capture_in_tmp_repo(%W(git rev-parse test_branch))
branch_del.should_not == branch_ref
end
end
describe :create_tag do
let(:gl_projects_create) {
build_gitlab_projects('import-project', repo_name, 'https://github.com/randx/six.git')
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment