Compare commits
4 Commits
5b749d2100
...
prod
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d3931d738 | |||
| 7c93f25a5d | |||
| 8445b64d6b | |||
| 8dfb3fe2a6 |
@@ -928,8 +928,18 @@
|
|||||||
git ls-remote --heads | sort
|
git ls-remote --heads | sort
|
||||||
|
|
||||||
if [[ "$base" != "dev" ]]; then
|
if [[ "$base" != "dev" ]]; then
|
||||||
echo -e "\n* Switching back to dev."
|
echo -e "\n* Checking if a dev branch exists."
|
||||||
git switch dev
|
git ls-remote --exit-code --heads origin dev
|
||||||
|
dev_exists="$?"
|
||||||
|
if [[ "$dev_exists" == 0 ]]; then
|
||||||
|
echo -e "\n* Switching back to dev."
|
||||||
|
git switch dev
|
||||||
|
elif [[ "$dev_exists" == 2 ]]; then
|
||||||
|
echo -e "\n* Switching back to main."
|
||||||
|
git switch main
|
||||||
|
else
|
||||||
|
echo "*** ERROR: Unknown status for dev_exists, '$dev_exists'. ***"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "\n* Verifying which branch we're on."
|
echo -e "\n* Verifying which branch we're on."
|
||||||
@@ -938,8 +948,11 @@
|
|||||||
alias load-prod="load-branch prod"
|
alias load-prod="load-branch prod"
|
||||||
alias load-stage="load-branch stage"
|
alias load-stage="load-branch stage"
|
||||||
alias rollback-prod="load-branch prod main"
|
alias rollback-prod="load-branch prod main"
|
||||||
alias rollback-stage="load-branch stage main"
|
alias rollback-stage="load-branch stage prod"
|
||||||
alias rollback-dev="load-branch dev main"
|
alias rollback-dev="load-branch dev stage"
|
||||||
|
alias reset-prod="load-branch prod main"
|
||||||
|
alias reset-stage="load-branch stage main"
|
||||||
|
alias reset-dev="load-branch dev main"
|
||||||
|
|
||||||
- name: General | Account Management | Users | Files | Common Variable
|
- name: General | Account Management | Users | Files | Common Variable
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
user: ansible
|
user: ansible
|
||||||
name: "Ansible Sync"
|
name: "Ansible Sync"
|
||||||
minute: "*/30"
|
minute: "*/30"
|
||||||
job: "sleep $(( $RANDOM / 20 )); sudo {{ ansible_pull_exec.stdout }} -v -o -U {{ git_repo_http }} --checkout {{ branch }}"
|
job: "bash -c 'sleep $(( $RANDOM / 20 )); sudo {{ ansible_pull_exec.stdout }} -v -o -U {{ git_repo_http }} --checkout {{ branch }}'"
|
||||||
state: present
|
state: present
|
||||||
disabled: "{{ 'yes' if no_telem else 'no' }}"
|
disabled: "{{ 'yes' if no_telem else 'no' }}"
|
||||||
|
|
||||||
@@ -21,6 +21,6 @@
|
|||||||
user: ansible
|
user: ansible
|
||||||
name: "Ansible Weekly Forced Sync"
|
name: "Ansible Weekly Forced Sync"
|
||||||
special_time: daily
|
special_time: daily
|
||||||
job: "sleep $(( $RANDOM / 1 )); sudo {{ ansible_pull_exec.stdout }} -v -U {{ git_repo_http }} --checkout {{ branch }}"
|
job: "bash -c 'sleep $(( $RANDOM / 1 )); sudo {{ ansible_pull_exec.stdout }} -v -U {{ git_repo_http }} --checkout {{ branch }}'"
|
||||||
state: present
|
state: present
|
||||||
disabled: "{{ 'yes' if no_telem else 'no' }}"
|
disabled: "{{ 'yes' if no_telem else 'no' }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user