Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 4 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ orbs:
install-halyard:
steps:
- run:
name: Install hal (debian < 10)
name: Install hal
command: |
echo "deb http://deb.debian.org/debian stretch-backports main" \
| sudo tee -a /etc/apt/sources.list.d/stretch-backports.list
sudo apt-get update
curl -O https://raw.githubusercontent.com/spinnaker/halyard/master/install/debian/InstallHalyard.sh
sudo bash InstallHalyard.sh --user $(whoami) -y
remove-bucket-if-exists:
Expand Down Expand Up @@ -80,7 +77,7 @@ parameters:

jobs:
trigger-integration-tests:
executor: spinnaker/default-stretch
executor: spinnaker/default
parameters:
cluster-name:
description: |
Expand All @@ -100,7 +97,7 @@ jobs:
}" "https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline"
# Integration test workflow jobs
install-spinnaker:
executor: spinnaker/default-stretch
executor: spinnaker/default
parameters:
cluster-name:
description: |
Expand Down Expand Up @@ -238,7 +235,7 @@ jobs:
--cloud-providers "kubernetes"
spin pipeline save --file tests/pipeline.json
test-spinnaker:
executor: spinnaker/default-stretch
executor: spinnaker/default
parameters:
cluster-name:
description: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
description: |
AWS region that the EKS cluster is in
type: string
executor: spinnaker/default-stretch
executor: spinnaker/default
steps:
# Set up k8s cluster connection.
# In this example, Spinnaker is deployed on an AWS EKS k8s cluster.
Expand Down
2 changes: 1 addition & 1 deletion src/examples/trigger-pipeline-with-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ usage:
description: |
AWS region that the EKS cluster is in
type: string
executor: spinnaker/default-stretch
executor: spinnaker/default
steps:
# Set up k8s cluster connection.
# In this example, Spinnaker is deployed on an AWS EKS k8s cluster.
Expand Down
12 changes: 0 additions & 12 deletions src/executors/default-stretch.yml

This file was deleted.

11 changes: 11 additions & 0 deletions src/executors/default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
description: |
This is a default executor providing an Ubuntu based Python image.
docker:
- image: 'cimg/python:<<parameters.tag>>'
parameters:
tag:
default: "3.9"
description: |
Pass a Python version. Available tags can be found here:
https://circleci.com/developer/images/image/cimg/python#image-tags
type: string