Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing condition for PR creation #1188

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Fixing condition for PR creation #1188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions deploy/kubernetes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,9 @@ ci-clone-kibana-repository:
## ci-create-kubernetes-templates-pull-request : Create the pull request for the kubernetes templates
.PHONY: ci-create-kubernetes-templates-pull-request
ci-create-kubernetes-templates-pull-request:
HASDIFF=$$(git status | grep $(FILE_REPO) | wc -l); \
if [ $${HASDIFF} -ne 1 ]; \
then \
echo "No differences found with kibana git repository" && \
exit 1; \
fi
HASDIFF=`git status | grep $(FILE_REPO) | wc -l`; \
echo $${HASDIFF}
ifeq ($${HASDIFF},1)
echo "INFO: Create branch to update k8s templates"
git config user.name obscloudnativemonitoring
git config user.email [email protected]
Expand All @@ -67,18 +64,24 @@ ci-create-kubernetes-templates-pull-request:
git diff --staged --quiet || git commit -m "[Automated PR] Publish kubernetes templates for elastic-agent"
echo "INFO: show remote details"
git remote -v

ifeq ($(DRY_RUN),TRUE)
echo "INFO: skip pushing branch"
echo "INFO: skip pushing branch"
else
echo "INFO: push branch"
@git push --set-upstream origin $(ELASTIC_AGENT_BRANCH)
echo "INFO: create pull request"
@gh pr create \
--title "Update kubernetes templates for elastic-agent" \
--body "Automated by ${BUILD_URL}" \
--label automation \
--base main \
--head $(ELASTIC_AGENT_BRANCH) \
--reviewer elastic/obs-cloudnative-monitoring
echo "INFO: push branch"
@git push --set-upstream origin $(ELASTIC_AGENT_BRANCH)
echo "INFO: create pull request"
@gh pr create \
--title "Update kubernetes templates for elastic-agent" \
--body "Automated by ${BUILD_URL}" \
--label automation \
--label release_note:automation \
--base main \
--head $(ELASTIC_AGENT_BRANCH) \
--reviewer elastic/obs-cloudnative-monitoring
endif

else
echo "No differences found with kibana git repository"
endif