From 00be0bad5846a801f458ea83a33324b985fea252 Mon Sep 17 00:00:00 2001 From: Eddie Mattia Date: Tue, 21 Apr 2026 08:06:07 -0700 Subject: [PATCH] Migrate to --from-obproject-toml, remove Azure config --- .github/workflows/deploy.yml | 24 +++---------- azure-pipelines.yml | 65 ------------------------------------ obproject.toml | 2 +- 3 files changed, 6 insertions(+), 85 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e2c3d9e..88590b7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,30 +28,17 @@ jobs: fetch-depth: 0 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: - python-version: 3.12 + python-version: "3.12" - name: Install dependencies - run: | - python3 -m pip install -U requests - python3 -m pip install outerbounds pyyaml - python3 -m pip install -U ob-project-utils + run: pip install outerbounds ob-project-utils + - name: Configure Outerbounds run: | - PROJECT_NAME=$(yq .project obproject.toml) - DEFAULT_CICD_USER="${PROJECT_NAME//_/-}-cicd" - PLATFORM=$(yq .platform obproject.toml) - CICD_USER=$(yq ".cicd_user // \"$DEFAULT_CICD_USER\"") - PERIMETER="default" - echo "🏗️ Deployment target:" - echo " Platform: $PLATFORM" - echo " CI/CD User: $CICD_USER" - echo " Perimeter: $PERIMETER" outerbounds service-principal-configure \ - --name $CICD_USER \ - --deployment-domain $PLATFORM \ - --perimeter $PERIMETER \ + --from-obproject-toml \ --github-actions - name: Deploy Project @@ -62,4 +49,3 @@ jobs: COMMENTS_URL: ${{ github.event.pull_request.comments_url }} PYTHONUNBUFFERED: 1 run: obproject-deploy - diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index b0c035a..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,65 +0,0 @@ -trigger: -- main - -pr: -- main - -pool: - vmImage: ubuntu-latest - -steps: -- checkout: self - -- task: AzureCLI@2 - displayName: 'Configure Outerbounds' - inputs: - azureSubscription: 'dev-ob' # Replace with your Azure service connection name - addSpnToEnvironment: true - scriptType: bash - scriptLocation: inlineScript - inlineScript: | - # Check if yq is available - which yq || (echo "yq not found, installing..." && wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 && chmod +x /usr/local/bin/yq) - - PROJECT_NAME=$(yq .project obproject.toml) - DEFAULT_CICD_USER="${PROJECT_NAME//_/-}-cicd" - PLATFORM=$(yq .platform obproject.toml) - CICD_USER=$(yq ".cicd_user // \"$DEFAULT_CICD_USER\"" obproject.toml) - PERIMETER="default" - echo "🏗️ Deployment target:" - echo " Platform: $PLATFORM" - echo " CI/CD User: $CICD_USER" - echo " Perimeter: $PERIMETER" - python -m pip install -U pyyaml requests toml 'outerbounds[azure]' ob-project-utils - outerbounds service-principal-configure \ - --name $CICD_USER \ - --deployment-domain $PLATFORM \ - --perimeter $PERIMETER \ - --jwt-token $idToken - -- script: | - # Debug environment detection - echo "=== Debugging CI Environment ===" - echo "BUILD_SOURCEBRANCH: $(Build.SourceBranch)" - echo "SYSTEM_COLLECTIONURI: $(System.CollectionUri)" - echo "Git branch from rev-parse: $(git rev-parse --abbrev-ref HEAD)" - echo "Git status:" - git status - echo "=== Running deploy ===" - - obproject-deploy - - displayName: 'Deploy Project' - env: - # https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - PYTHONUNBUFFERED: 1 - # Pass all Azure DevOps variables that the deploy script needs - BUILD_SOURCEBRANCH: $(Build.SourceBranch) - SYSTEM_PULLREQUEST_SOURCEBRANCH: $(System.PullRequest.SourceBranch) - SYSTEM_COLLECTIONURI: $(System.CollectionUri) - SYSTEM_TEAMPROJECT: $(System.TeamProject) - BUILD_REPOSITORY_NAME: $(Build.Repository.Name) - BUILD_REPOSITORY_ID: $(Build.Repository.ID) - BUILD_BUILDID: $(Build.BuildId) - SYSTEM_PULLREQUEST_PULLREQUESTID: $(System.PullRequest.PullRequestId) \ No newline at end of file diff --git a/obproject.toml b/obproject.toml index a3c5126..57c5578 100644 --- a/obproject.toml +++ b/obproject.toml @@ -1,6 +1,6 @@ # ⬇️ Change this to match the URL of your Outerbounds deployment -platform = 'dev-silverwing.outerbounds.xyz' +platform = 'dev-yellow.outerbounds.xyz' # ⬇️ Change these to match your project name project = 'ob_project_empty'