diff --git a/contrib/deploy-onefuzz-via-azure-devops/deploy-onefuzz.yml b/contrib/deploy-onefuzz-via-azure-devops/deploy-onefuzz.yml index 94aca10c3..c9ec4c1de 100644 --- a/contrib/deploy-onefuzz-via-azure-devops/deploy-onefuzz.yml +++ b/contrib/deploy-onefuzz-via-azure-devops/deploy-onefuzz.yml @@ -121,6 +121,6 @@ stages: targetType: 'inline' script: | set -ex - ./onefuzz-cli-$(version).exe config --endpoint $(ONEFUZZ_SERVICE_URL) --client_id "$(AZURE_CLIENT_ID)" --client_secret "$(AZURE_CLIENT_SECRET)" --authority "https://login.microsoftonline.com/$(AZURE_TENANT_ID)" + ./onefuzz-cli-$(version).exe config --endpoint $(ONEFUZZ_SERVICE_URL) --override_client_id "$(AZURE_CLIENT_ID)" ./onefuzz-cli-$(version).exe --version until ./onefuzz-cli-$(version).exe versions check --exact; do echo "waiting due to version mismatch"; sleep 1; done diff --git a/contrib/onefuzz-job-azure-devops-pipeline/azure-pipelines.yml b/contrib/onefuzz-job-azure-devops-pipeline/azure-pipelines.yml index bfdf6ba6b..f76a8b929 100644 --- a/contrib/onefuzz-job-azure-devops-pipeline/azure-pipelines.yml +++ b/contrib/onefuzz-job-azure-devops-pipeline/azure-pipelines.yml @@ -34,8 +34,8 @@ jobs: set -ex pip install onefuzz sed -i s/INSERT_PAT_HERE/$(ado_pat)/ ado-work-items.json - onefuzz config --endpoint $(endpoint) --client_id $(client_id) --client_secret $(client_secret) - onefuzz template libfuzzer basic ${{ parameters.onefuzz_project }} ${{ parameters.onefuzz_target }} $(Build.SourceVersion) ${{ parameters.onefuzz_pool }} --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./ado-work-items.json + onefuzz config --endpoint $(endpoint) --override_client_id $(client_id) + onefuzz --client_secret $(client_secret) template libfuzzer basic ${{ parameters.onefuzz_project }} ${{ parameters.onefuzz_target }} $(Build.SourceVersion) ${{ parameters.onefuzz_pool }} --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./ado-work-items.json displayName: run onefuzz env: client_secret: client_secret diff --git a/contrib/onefuzz-job-github-actions/github-pipeline.yml b/contrib/onefuzz-job-github-actions/github-pipeline.yml index 44e08e4eb..d0eee29ea 100644 --- a/contrib/onefuzz-job-github-actions/github-pipeline.yml +++ b/contrib/onefuzz-job-github-actions/github-pipeline.yml @@ -47,7 +47,7 @@ jobs: # On Windows, this text replacement could instead be implemented via PowerShell. sed -i s/INSERT_YOUR_PERSONAL_ACCESS_TOKEN_HERE/${ONEFUZZ_PAT}/ github-issues.json - onefuzz config --endpoint $ONEFUZZ_ENDPOINT --client_id $ONEFUZZ_CLIENT_ID --client_secret $ONEFUZZ_CLIENT_SECRET - onefuzz template libfuzzer basic $ONEFUZZ_PROJECT $ONEFUZZ_NAME $GITHUB_SHA $ONEFUZZ_POOL --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./github-issues.json + onefuzz config --endpoint $ONEFUZZ_ENDPOINT --override_client_id $ONEFUZZ_CLIENT_ID + onefuzz --client_secret $ONEFUZZ_CLIENT_SECRET template libfuzzer basic $ONEFUZZ_PROJECT $ONEFUZZ_NAME $GITHUB_SHA $ONEFUZZ_POOL --target_exe fuzz.exe --colocate_all_tasks --duration 1 --vm_count 1 --notification_config @./github-issues.json # Default for Linux. Would only need to be specified if `runs-on` == `windows-latest`. shell: bash \ No newline at end of file