Skip to content

Commit

Permalink
docs:Merge remote-tracking branch 'origin/v3' into v3-documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Jcahilltorre committed Oct 29, 2024
2 parents 15fe625 + 0bdbf97 commit ef65181
Show file tree
Hide file tree
Showing 73 changed files with 3,806 additions and 1,225 deletions.
46 changes: 17 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,34 +307,22 @@ jobs:
if: ${{ success() && github.ref_name == 'v3'}}
run: git push 'https://github-actions:${{ secrets.GITHUB_TOKEN }}@github.com/nginx/agent.git' benchmark-results:benchmark-results

publish-packages-vars:
name: Set workflow variables
publish-packages:
name: Publish NGINX Agent v3 packages
if: ${{ github.ref_name == 'v3' &&
!github.event.pull_request.head.repo.fork }}
runs-on: ubuntu-22.04
outputs:
package_build_num: ${{ steps.get_build_num.outputs.build_num }}
steps:
- name: Get the build number
id: get_build_num
run: echo "build_num=${{ github.run_number }}-$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT

# publish-packages:
# name: Publish NGINX Agent v3 packages
# if: ${{ github.ref_name == 'v3' &&
# !github.event.pull_request.head.repo.fork }}
# needs: [ lint, unit-test, performance-tests,
# load-tests, official-oss-image-integration-tests,
# official-plus-image-integration-tests,
# race-condition-test, publish-packages-vars ]
# uses: ./.github/workflows/release-branch.yml
# secrets: inherit
# permissions:
# id-token: write
# contents: read
# with:
# packageVersion: "3.0.0"
# packageBuildNo: "${{ needs.publish-packages-vars.outputs.package_build_num }}"
# uploadAzure: true
# publishPackages: true
# releaseBranch: "v3"
needs: [ lint, unit-test, performance-tests,
load-tests, official-oss-image-integration-tests,
official-plus-image-integration-tests,
race-condition-test ]
uses: ./.github/workflows/release-branch.yml
secrets: inherit
permissions:
id-token: write
contents: read
with:
packageVersion: "3.0.0"
packageBuildNo: "${{ github.run_number }}"
uploadAzure: true
publishPackages: true
releaseBranch: "v3"
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ build-test-oss-image:
--build-arg PACKAGES_REPO=$(OSS_PACKAGES_REPO) \
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
--build-arg ENTRY_POINT=./test/docker/entrypoint.sh

.PHONY: build-mock-collector-image
build-mock-collector-image:
$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build -t mock-collector . \
--no-cache -f ./test/mock/collector/mock-collector/Dockerfile

.PHONY: run-mock-management-otel-collector
run-mock-management-otel-collector: ## Run mock management plane OTel collector
Expand Down
Loading

0 comments on commit ef65181

Please sign in to comment.