Questions tagged [git]
Use this tag for questions about Git, a free and open source distributed version control system, related to using Git for topics such as continuous delivery, monitoring, building SDLC infrastructure, etc.
0
votes
0answers
10 views
How to include releases of some repo in another GitHub repo?
I have some project which consists of repo A (which contains sourcecode) and repo B (which contains config files for the project). I want to make another repo C to represent the whole project, and ...
0
votes
1answer
18 views
How do I automate the process of pulling the latest code and restarting a service on git push?
I have an application (Logstash) running on a Linux VM and the settings for it are on a GitLab repo. What I want is for the VM to pull the latest version of the settings file and restart the service ...
0
votes
1answer
16 views
git - develop base and extended feature - commits in base should reflect in extended in pull
Hie I am working around in git to achieve something like mentioned below.
Imagine there is a Big feature which is going to develop - since it's very big they have split into core feature and an ...
2
votes
3answers
87 views
What are the best practices of merging dev to master?
We have 2 branches (master/dev) + some feature branches and 2 environments (production/dev). Our team is a very small people. What are the best practices of merging dev to master?
Every morning?
...
0
votes
0answers
21 views
How to completely replace master with another branch in TFS Azure Devops
Using TFS Azure Devops, there is a repo with valid code being maintained in a secondary branch. However, the master branch is multiple years out of date.
I want to obliterate the contents of master ...
0
votes
1answer
14 views
TravisCI did not run after adding more configuration to .travis.yml file
I added some AWS keys to my .travis.yml file so that it would deploy my application over to ElasticBeanstalk, but after I committed the changes to the file and pushed to master, nothing happened.
I ...
0
votes
2answers
67 views
Connecting GitHub to Jenkins running on docker toolbox
Started to learn DevOps 3 days ago, so I have a lot to learn!
I have a jenkins running on docker toolbox container and I can access it via 192.168.99.100:8080.
I configured a job and managed to use "...
1
vote
1answer
15 views
Github rest api post label gives error for array input
We are hosting GitHub enterprise for our development. I am able to access the reset api and create jira, create PR etc.
When I try to add label to my PR, it gives error for array.
curl -X POST -u ...
0
votes
0answers
23 views
How to build docker image from git repository with root context and Dockerfile inside a subdirectory
In the docker documentation one can see that it is possible to build an image from git repository. It is even possible to make a build from the selected branch and directory. I have a repository with ...
0
votes
2answers
33 views
How to keep original and new repositories in sync during a migration? (including the commit history)
We have a git repository that is currently hosted on Azure Devops and have to migrate it to our in house TFS 2017 git (the move is due to a business decision).
But during this setup we need to run ...
8
votes
3answers
74 views
Should developer wait for CI pipeline to complete or start next task after pushing
My company is integrating CI/CD, so far we have implemented CI from what I understand. Currently when a developer pushes code to our git repo, the CI pipeline runs.
Currently our CI pipeline include ...
0
votes
0answers
30 views
VSTS Azure for DevOps: Unit test checking mechanism on pull request
Is there a way in VSTS Azure for DevOps to implement unit test checking mechanism on pull request.
The condition is to only allow commits that change something in the unittest folder for example.
0
votes
2answers
59 views
Automate creation of branch + pull-request
I have a repository (call it repo-X) of shell.nix files that define development environments for a number of separate projects (call them project-A, project-B).
When one of the projects releases a ...
1
vote
2answers
63 views
Gitworkflow and testing short lived feature branches in Openshift/Kubernetes
Recently my team started adapting git workflow for agile-based delivery, we've been using JIRA, TeamCity and various other CI tools to complete the pipeline. The workflow works great for monolith or ...
0
votes
1answer
28 views
GitHub merge access
I am trying to create a GitHub workflow (not GitHub flow), where specific people will have merge only access to a branch in repo.
I tried a few things, and I found that I can restrict users to read ...
2
votes
1answer
151 views
Run scripts which are stored in GitLab from Jenkins
I have configured Jenkins Build Jobs and Deployment Jobs from using Jenkins shell. But I put all the commands in Shell to execute. Can I store those commands in GitLab and execute from jenkins?
0
votes
1answer
42 views
Push specific changes (defect fix) and not feature changes
I am new to DevOps. I am using Jenkins and GitHub for salesforce deployment.
Setup
We have a develop branch. Feature branches are created out of it. When merged to develop, the deployment to the ...
1
vote
0answers
41 views
Appropriate use cases for git submodule and braid
For what use cases are git submodules (or subtrees) better suited than braid and vice-versa?
1
vote
1answer
52 views
Where is the git submodule revision actually stored?
I understand how to use git submodule to reference a specific commit in another repo, but where is that reference actually stored? It doesn't seem to be in .gitmodules as plain text?
1
vote
1answer
57 views
How to use Jenkins github user credentials to access github api in my script?
I have a Jenkins job foo that works perfectly well. It is authenticated with jenkins_foo_user. It is able to clone the repo and checkout the right branch.
In my codebase, I have another script - ...
3
votes
0answers
120 views
How to implement GitLab Flow branching model for microservices?
Recently I’ve been looking into alternatives to the git flow branching model and since I’m already using GitLab, I stumbled upon their own branching model called GitLab flow. I’m currently trying to ...
0
votes
2answers
19 views
How to make one branch public while the others remain private on GitLab?
I am currently working on a LaTeX template. I chose gitlab to host the template.
Now I want to give some colleagues access to my template, but only to the master branch. I use the other branches to ...
4
votes
3answers
146 views
Tips for separating DevOps Git repos?
We currently have a Git repo with automation code (with tests), iaas-code and lamba-code.
The automation code is mostly Fabric, Python and unittests.
The Iaas-code is mostly CloudFormation, Docker-...
1
vote
0answers
19 views
How to configure a pull request quorum making an organizational constraint?
Consider the following situation.
Alice and Anna, Bob and Bart, and finally Eve and Evelyn work on same Git project in three different organizations.
How can they configure a quorum for pull ...
0
votes
0answers
24 views
How to FTP Directly from 3rdPartyHostingServer to ClountStack like GitLab, GitHub, AWS,etc?
I am working on a Web App. I am facing an issue with DevOps environment and looking for a solution for the same. My local machine is Win10 machine.
I have my code on a 3rdParty Hosting Server(e.g ...
3
votes
1answer
121 views
What's the practice to perform a releasing with Git?
I'm using GitLab CE with Maven project, and try to follow the Environment branches with GitLab flow and The 11 Rules of GitLab Flow
The step for releasing is as the following: -
feature +--- +-...
0
votes
0answers
132 views
Chef git private repo using username/password
I am wanting to clone a git repo using the git resource in Chef but instead of SSH like everywhere seems to show I want to use just username/password. The security of the repo is not important but don'...
0
votes
0answers
50 views
Managing Cloud Formation Templates in SCM and S3 Buckets
I have multiple projects with a CFT stored in Git. However, these CFT files are too large (exceed Amazon's 51k byte limit) and have to be stored in S3. What is an effective method that would allow ...
0
votes
0answers
60 views
Source Control Layout
I'm starting to organize some of our custom VSTS tasks. I'm trying to follow the layout that Microsoft uses at Their GitHub Rpo. I also want to hook up CI/CD with this repo. My issue arises here. I ...
3
votes
1answer
58 views
When to get rid of '-SNAPSHOT'
I'm working on a Git workflow (not git-flow) for a Java project that uses Maven and Artifactory for artifact storage. On develop and feature/* branches the version number contains '-SNAPSHOT'. It is ...
3
votes
2answers
94 views
Git - Everyone Pushing to Same Branch in Different Files
Database team is implementing code changes, using Visual Studio SSDT database projects with Git source control. Everyone is pushing to main Release branch with code review (only 5 developers on the ...
2
votes
1answer
591 views
jenkins fatal: ambiguous argument, unknown revision or path not in the working tree
In jenkins pipeline, execute git command :
git log --format=%B --no-merges origin/master..origin/${currentBranch}
jenkins output error :
fatal: ambiguous argument 'origin/master..origin/XOPS-...
2
votes
2answers
95 views
Merging Git Database Commits from One Branch to Another without Cherrypicking
We have main two Git branches at our company:
During our Sprint,
Everyone has (local branches)
Release branch: Contains prepared/developed code, ready for testing, and
Master branch: Production- ...
1
vote
1answer
48 views
Git repo setup for multiple dot net project
I have a dot net solution containing a WPF application, MS-SQL database, and 2 dlls. Each is their own product in the sense that each can be shipped independently (dlls go to nuget to be consumed by ...
1
vote
1answer
3k views
Jenkins shows “No changes in any of the builds.”
Description
Jenkins job was made and configured to build release branch which already existed and had changes on it before first build. Job also monitors for push on BitBucket and starts building if ...
4
votes
1answer
271 views
Heroku Slack integration without using Github
Heroku has this great Slack chatbot (chatops) that lets you send messages if a deployment pipeline succeeded or failed. Unfortunately, while setting it up and logging in to Heroku, it asks for your ...
8
votes
3answers
159 views
What's a good devops approach for a single developer writing python web applications?
I'm guessing this question will seem incredibly trivial for some readers, but as someone who is a developer but with little experience of deploying apps in anything other than a manual, hit and hope ...
1
vote
1answer
98 views
Customizing deploy key and ssh wrapper path for git cloning through application_git cookbook
I am using Chef 12.0.3 for managing servers. Earlier I was using application cookbook for cloning repository. But now in higher version of application cookbook, this support is moved to new cookbook ...
2
votes
1answer
132 views
Pros and cons of different deploy strategies
I am not sure about the best way to deploy my program.
Lets assume i have two relevant branches release(tested and ready to deploy code) and master.
I have two options
1.Merge the release to master ...
6
votes
4answers
610 views
What do you need for a monorepo for a large codebase?
From certain size of the codebase, would you still have Git or are there more specialized solutions?
(Also to checkout just a part of the codebase)
1
vote
1answer
88 views
Deploying a SaaS solution which is custom for every customer
So we have 5 repositories (Individual web services ex. CMS/E-commerce and internal APIs) which are currently deployed as Docker containers.
What we plan to do is to use these services and make a ...
2
votes
2answers
548 views
Git Workflow with User Acceptance and Staging Environments
I'm trying to streamline/standardize a git workflow in my workplace. The current delopment process is as follows:
Pull 'development' branch
Write code and commit and push to 'development' branch
...
1
vote
1answer
342 views
How should we organize VSTS repositories?
We are a small company with the following systems:
External Web Site for pre-customers (already created in ASP.NET Framework),
External Mobile Application for customers (in progress in Flutter),
...
2
votes
2answers
3k views
Does Jenkins support cloning git submodules with “git@” (not “https”) URLs?
Had some issues with Jenkins when trying to checkout a project with Git nested submodules. It failed with a permission error when cloning the submodules:
hudson.plugins.git.GitException: Command "git ...
2
votes
1answer
80 views
Git Files Encryption for Business
I am using git and have the following problem:
In the company where I work you now want to protect the source code from theft.
So if for some reason a developer lets the source code of a project go ...
4
votes
2answers
128 views
Automating creation of new VM and pushing code to server
Automating creating of new VM and pushing code to server
Hi all,
I am writing a integration test for a client-server application. To simulate
the production server setup, and to update the code, I ...
1
vote
2answers
684 views
Does HA-git exist?
For the second time in three months, bitbucket is down
https://status.developer.atlassian.com/
Now I wonder whether HA-git is possible or we should switch. Thanks to this it will be hard to finish ...
6
votes
2answers
452 views
Coupling docker registry and source control
What are the best practices (if any) for coupling a docker image registry with a SCM service (such as bitbucket)?
I know a docker registry can live in artifactory, but how can I assure that the two ...
4
votes
1answer
2k views
What git command could be used to check when a remote branch was created?
Git is used at work. The number of branches is growing and growing. The aim is to remove branches that are older than X weeks.
Attempt 1
Running git branch -h will probably indicate what to run to ...
17
votes
3answers
6k views
Where to put ansible-vault password
We are planning to use ansible vault in our project to prevent leaking passwords or keys in git.
The idea is to put all our sensitive data into a plain file then encrypt this file with ansible-vault ...
