From 1bba24695d83fe012c4b725ecafdf4a9345cf8f0 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso <106103383+victoriaatraft@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:53:12 -0800 Subject: [PATCH 1/4] Update design-deliverable-issue-template.md (#3287) Adding option to update service blueprint Co-authored-by: Andrew <84722778+andrew-jameson@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/design-deliverable-issue-template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/design-deliverable-issue-template.md b/.github/ISSUE_TEMPLATE/design-deliverable-issue-template.md index 35eb23ed7..509198d3e 100644 --- a/.github/ISSUE_TEMPLATE/design-deliverable-issue-template.md +++ b/.github/ISSUE_TEMPLATE/design-deliverable-issue-template.md @@ -24,7 +24,7 @@ assignees: '' - [ ] Documentation work for the following has occurred: - [ ] Relevant User stories. - [ ] Recommended pa11y checks. - - [ ] Updating living UX documents, e.g. User Flows or Personas(if relevant). + - [ ] Updating living UX documents, e.g. User Flows, Personas, [Service Blueprint](https://www.figma.com/design/irgQPLTrajxCXNiYBTEnMV/TDP-Mockups-For-Feedback?node-id=9080-4762) (if relevant). - [ ] Internal Raft Review has occurred to ensure DoD standards and QA - [ ] Dev/Design sync has occurred; resulting tickets created - [ ] The design is usable and accessible, meaning it adheres to definition of done standards for design work. From d4b7f7640f2b3f3e31b5bbc098b16bbb475a3578 Mon Sep 17 00:00:00 2001 From: Andrew <84722778+andrew-jameson@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:52:20 -0500 Subject: [PATCH 2/4] Hotfix/cf check (#3337) * Standardizing on use of cf-check on older workflow * Standardizing use of cf-check on older workflows --------- Co-authored-by: jtimpe <111305129+jtimpe@users.noreply.github.com> --- .circleci/deployment/commands.yml | 21 ++------------------- scripts/cf-check.sh | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml index d1aa82b7d..180d0847e 100644 --- a/.circleci/deployment/commands.yml +++ b/.circleci/deployment/commands.yml @@ -226,15 +226,7 @@ default: CF_APP steps: - checkout - - run: - name: Install dependencies - command: | - apk update - apk add jq - apk add curl - # TODO: Add Signature check - curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github" | tar -zx - mv cf7 /usr/local/bin/cf + - cf-check - login-cloud-dot-gov: cf-password: <> cf-username: <> @@ -285,16 +277,7 @@ type: string steps: - checkout - - run: - name: Install dependencies - command: | - sudo apt update - sudo apt install jq - sudo apt install curl - # TODO: Add Signature check - curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github" | tar -zx - sudo mv cf7 /usr/local/bin/cf - sudo chmod +x /usr/local/bin/cf + - cf-check - login-cloud-dot-gov: cf-password: <> cf-username: <> diff --git a/scripts/cf-check.sh b/scripts/cf-check.sh index 5a2c84be7..8e0c5872b 100755 --- a/scripts/cf-check.sh +++ b/scripts/cf-check.sh @@ -4,7 +4,7 @@ if command -v cf /dev/null 2>&1; then echo The command cf is available else apt-get update - apt-get install wget gnupg2 apt-transport-https + apt-get install wget gnupg2 apt-transport-https jq NEXUS_ARCHIVE="cf7-cli_7.7.13_linux_x86-64.tgz" NEXUS_URL="https://tdp-nexus.dev.raftlabs.tech/repository/tdp-bin/cloudfoundry-cli/$NEXUS_ARCHIVE" From 1bd1a430280f761417b761bdd6398f24ba315bfd Mon Sep 17 00:00:00 2001 From: Andrew <84722778+andrew-jameson@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:18:20 -0500 Subject: [PATCH 3/4] Hotfix/cf check (#3339) * Standardizing on use of cf-check on older workflow * Standardizing use of cf-check on older workflows * terraform executor edge-case --------- Co-authored-by: jtimpe <111305129+jtimpe@users.noreply.github.com> --- scripts/cf-check.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/cf-check.sh b/scripts/cf-check.sh index 8e0c5872b..cc0eddd27 100755 --- a/scripts/cf-check.sh +++ b/scripts/cf-check.sh @@ -3,8 +3,14 @@ set -e if command -v cf /dev/null 2>&1; then echo The command cf is available else - apt-get update - apt-get install wget gnupg2 apt-transport-https jq + if [[ -f /bin/terraform ]]; then + echo "This is our Terraform executor" + apk update + apk install curl jq + else + apt-get update + apt-get install curl wget gnupg2 apt-transport-https jq + fi NEXUS_ARCHIVE="cf7-cli_7.7.13_linux_x86-64.tgz" NEXUS_URL="https://tdp-nexus.dev.raftlabs.tech/repository/tdp-bin/cloudfoundry-cli/$NEXUS_ARCHIVE" From 52653f2843c470bbb6a2424aeb06eb16c43ed698 Mon Sep 17 00:00:00 2001 From: Andrew <84722778+andrew-jameson@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:57:41 -0500 Subject: [PATCH 4/4] Hotfix/cf check (#3340) * Standardizing on use of cf-check on older workflow * Standardizing use of cf-check on older workflows * terraform executor edge-case * Testing pipeline with non-develop branch * included this branch for deployment workflows * exclude duplicate deploy-dev workflow * more exclusions for hotfix branch * apk doesn't have install, use add * certifying whole pipeline runs for this branch * Removing branch-specific carve-outs in pipeline --------- Co-authored-by: jtimpe <111305129+jtimpe@users.noreply.github.com> --- .circleci/deployment/commands.yml | 1 + scripts/cf-check.sh | 6 +++--- scripts/sudo-check.sh | 10 ++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml index 180d0847e..992f6440d 100644 --- a/.circleci/deployment/commands.yml +++ b/.circleci/deployment/commands.yml @@ -226,6 +226,7 @@ default: CF_APP steps: - checkout + - sudo-check - cf-check - login-cloud-dot-gov: cf-password: <> diff --git a/scripts/cf-check.sh b/scripts/cf-check.sh index cc0eddd27..684e38492 100755 --- a/scripts/cf-check.sh +++ b/scripts/cf-check.sh @@ -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 @@ -18,5 +19,4 @@ else tar xzf $NEXUS_ARCHIVE mv ./cf7 /usr/local/bin/cf cf --version - fi diff --git a/scripts/sudo-check.sh b/scripts/sudo-check.sh index 5438bcef9..a604430b7 100755 --- a/scripts/sudo-check.sh +++ b/scripts/sudo-check.sh @@ -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 \ No newline at end of file