From adc43054e56e9d5a573594c0366234ee473824dc Mon Sep 17 00:00:00 2001 From: Riley Seaburg Date: Mon, 22 Dec 2025 22:20:45 +0000 Subject: [PATCH 1/5] Fix cf-cli download URL to use direct GitHub release URL --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d8c3c694..2838dddba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,16 +121,16 @@ jobs: mkdir /tmp/test-results TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)" - bundle exec rspec --format progress \ - --format RspecJunitFormatter \ - --out /tmp/test-results/rspec.xml \ - --format progress \ - $TEST_FILES + bundle exec rspec --format progress \ + --format RspecJunitFormatter \ + --out /tmp/test-results/rspec.xml \ + --format progress \ + $TEST_FILES # Install Cloud Foundry cli (cf) before deploy step. cf is used to push to Cloud.gov - run: name: Install-cf-cli command: | - curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&source=github' + curl -L -o cf-cli_amd64.deb 'https://github.com/cloudfoundry/cli/releases/download/v8.17.0/cf8-cli-installer_8.17.0_x86-64.deb' sudo dpkg -i cf-cli_amd64.deb cf -v # collect reports @@ -180,7 +180,7 @@ jobs: - run: name: Install-cf-cli command: | - curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&source=github' + curl -L -o cf-cli_amd64.deb 'https://github.com/cloudfoundry/cli/releases/download/v8.17.0/cf8-cli-installer_8.17.0_x86-64.deb' sudo dpkg -i cf-cli_amd64.deb cf -v - run: From 9ecb0493290bd94b4373d5a6e6736b4eefaf9c54 Mon Sep 17 00:00:00 2001 From: Riley Seaburg Date: Mon, 22 Dec 2025 22:53:46 +0000 Subject: [PATCH 2/5] Fix cf-cli installation using APT repository instead of direct download --- .circleci/config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2838dddba..cf17701a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -130,8 +130,10 @@ jobs: - run: name: Install-cf-cli command: | - curl -L -o cf-cli_amd64.deb 'https://github.com/cloudfoundry/cli/releases/download/v8.17.0/cf8-cli-installer_8.17.0_x86-64.deb' - sudo dpkg -i cf-cli_amd64.deb + wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - + echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list + sudo apt-get update + sudo apt-get install -y cf8-cli cf -v # collect reports - store_test_results: @@ -180,8 +182,10 @@ jobs: - run: name: Install-cf-cli command: | - curl -L -o cf-cli_amd64.deb 'https://github.com/cloudfoundry/cli/releases/download/v8.17.0/cf8-cli-installer_8.17.0_x86-64.deb' - sudo dpkg -i cf-cli_amd64.deb + wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - + echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list + sudo apt-get update + sudo apt-get install -y cf8-cli cf -v - run: name: Run CRON tasks From f527d3b34998eb39e60a0b952b590f5895b89118 Mon Sep 17 00:00:00 2001 From: Riley Seaburg Date: Mon, 22 Dec 2025 16:56:14 -0600 Subject: [PATCH 3/5] Update .circleci/config.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Riley Seaburg --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf17701a8..8466750f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -130,8 +130,9 @@ jobs: - run: name: Install-cf-cli command: | - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - - echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list + sudo mkdir -p /etc/apt/trusted.gpg.d + sudo wget -q -O /etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key + echo "deb [signed-by=/etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list sudo apt-get update sudo apt-get install -y cf8-cli cf -v From 03fd10dc11fe39b8c16ed68f2eb57d1a2dea2cf6 Mon Sep 17 00:00:00 2001 From: Riley Seaburg Date: Mon, 22 Dec 2025 16:56:21 -0600 Subject: [PATCH 4/5] Update .circleci/config.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Riley Seaburg --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8466750f0..d66b4cd7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -183,8 +183,9 @@ jobs: - run: name: Install-cf-cli command: | - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add - - echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list + # Install Cloud Foundry CLI repository key using modern signed-by mechanism + sudo wget -q -O /etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key + echo "deb [signed-by=/etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list sudo apt-get update sudo apt-get install -y cf8-cli cf -v From 6626b3fbf19d5bb8e4133f6935f218a545f4a8e0 Mon Sep 17 00:00:00 2001 From: Riley Seaburg Date: Tue, 23 Dec 2025 04:10:12 +0000 Subject: [PATCH 5/5] Add missing touchpoints-s3-uploads service binding to manifest The production deployment was failing because new instances crashed on startup. Root cause: the manifest was missing the touchpoints-s3-uploads service that the app expects. CF was unbinding this service during rolling deployments, causing Rails to exit with status 1. --- touchpoints.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/touchpoints.yml b/touchpoints.yml index 2e7338fba..7d07d1dde 100644 --- a/touchpoints.yml +++ b/touchpoints.yml @@ -35,5 +35,6 @@ applications: - touchpoints-redis-service - touchpoints-prod-s3 - touchpoints-prod-deployer + - touchpoints-s3-uploads routes: - route: touchpoints.app.cloud.gov