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

Hotfix/cf check #3340

Merged
merged 14 commits into from
Dec 5, 2024
Merged

Hotfix/cf check #3340

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
23a4ef7
Standardizing on use of cf-check on older workflow
andrew-jameson Dec 4, 2024
a954391
Standardizing use of cf-check on older workflows
andrew-jameson Dec 4, 2024
0668c0d
Merge branch 'develop' into hotfix/cf-check
jtimpe Dec 4, 2024
9481e46
Merge branch 'develop' into hotfix/cf-check
andrew-jameson Dec 4, 2024
d9a58ba
terraform executor edge-case
andrew-jameson Dec 4, 2024
3b59b2a
Merge branch 'hotfix/cf-check' of github.com:raft-tech/TANF-app into …
andrew-jameson Dec 4, 2024
69c4e64
Testing pipeline with non-develop branch
andrew-jameson Dec 5, 2024
7a12ced
Merge branch 'develop' into hotfix/cf-check
andrew-jameson Dec 5, 2024
9e0f189
included this branch for deployment workflows
andrew-jameson Dec 5, 2024
cd9a9a1
exclude duplicate deploy-dev workflow
andrew-jameson Dec 5, 2024
f8805fc
more exclusions for hotfix branch
andrew-jameson Dec 5, 2024
f91e310
apk doesn't have install, use add
andrew-jameson Dec 5, 2024
0a34019
certifying whole pipeline runs for this branch
andrew-jameson Dec 5, 2024
c2aa4bc
Removing branch-specific carve-outs in pipeline
andrew-jameson Dec 5, 2024
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
1 change: 1 addition & 0 deletions .circleci/deployment/commands.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@
default: CF_APP
steps:
- checkout
- sudo-check
- cf-check
- login-cloud-dot-gov:
cf-password: <<parameters.cf-password>>
Expand Down
7 changes: 7 additions & 0 deletions .circleci/deployment/workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- equal: [ master, << pipeline.git.branch >> ]
- equal: [ main, << pipeline.git.branch >> ]
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ hotfix/cf-check, << pipeline.git.branch >> ]
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- << pipeline.parameters.run_dev_deployment >>
- not: << pipeline.parameters.run_nightly_owasp_scan >>

Expand All @@ -21,6 +22,7 @@
branches:
ignore:
- develop
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- main
- master
- deploy-infrastructure-staging:
Expand All @@ -29,6 +31,7 @@
only:
- develop
- main
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- deploy-infrastructure-production:
filters:
branches:
Expand Down Expand Up @@ -91,6 +94,7 @@
branches:
ignore:
- develop
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- main
- master
- build-and-tag-develop:
Expand All @@ -100,13 +104,15 @@
branches:
only:
- develop
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- deploy-develop:
requires:
- build-and-tag-develop
filters:
branches:
only:
- develop
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- build-and-tag-staging:
requires:
- deploy-infrastructure-staging
Expand Down Expand Up @@ -142,6 +148,7 @@
branches:
only:
- develop
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- make_erd: # from ../util folder
filters:
branches:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ on:
push:
branches-ignore:
- develop
- hotfix/cf-check
andrew-jameson marked this conversation as resolved.
Show resolved Hide resolved
- main
- master
- 'release/**'
Expand Down
6 changes: 3 additions & 3 deletions scripts/cf-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ if command -v cf /dev/null 2>&1; then
echo The command cf is available
else
if [[ -f /bin/terraform ]]; then
echo "This is our Terraform executor"
echo "This is our Terraform executor, Alpine Linux v3.13"
apk update
apk install curl jq
apk add curl jq

else
apt-get update
apt-get install curl wget gnupg2 apt-transport-https jq
Expand All @@ -18,5 +19,4 @@ else
tar xzf $NEXUS_ARCHIVE
mv ./cf7 /usr/local/bin/cf
cf --version

fi
10 changes: 8 additions & 2 deletions scripts/sudo-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ if command -v sudo /dev/null 2>&1; then
echo The command sudo is available
else
echo The command sudo is not available installing...
apt-get update && apt-get install -y sudo
ls -al /bin/sh && sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh && ls -al /bin/sh
if [ -f /bin/terraform ]; then
echo "This is our Terraform executor, Alpine Linux v3.13"
apk update
apk add sudo
else
apt-get update && apt-get install -y sudo
ls -al /bin/sh && sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh && ls -al /bin/sh
fi
fi
Loading