From 2021e47ac81d7a4cfbae575c2ba9165c71bd362f Mon Sep 17 00:00:00 2001 From: Rui Cao Date: Thu, 13 Aug 2020 08:45:26 +0800 Subject: [PATCH] [Windows] Test scripts Signed-off-by: Rui Cao --- .github/workflows/upload_release_assets.yml | 144 -------------------- hack/release/prepare-assets.sh | 25 ---- hack/windows/Helper.psm1 | 2 +- 3 files changed, 1 insertion(+), 170 deletions(-) diff --git a/.github/workflows/upload_release_assets.yml b/.github/workflows/upload_release_assets.yml index e1e6e43192a..f94ee53b03a 100644 --- a/.github/workflows/upload_release_assets.yml +++ b/.github/workflows/upload_release_assets.yml @@ -16,150 +16,6 @@ jobs: run: | mkdir assets VERSION="${TAG:10}" ./hack/release/prepare-assets.sh ./assets - - name: Upload antctl-darwin-x86_64 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antctl-darwin-x86_64 - asset_name: antctl-darwin-x86_64 - asset_content_type: application/octet-stream - - name: Upload antctl-linux-arm - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antctl-linux-arm - asset_name: antctl-linux-arm - asset_content_type: application/octet-stream - - name: Upload antctl-linux-arm64 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antctl-linux-arm64 - asset_name: antctl-linux-arm64 - asset_content_type: application/octet-stream - - name: Upload antctl-linux-x86_64 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antctl-linux-x86_64 - asset_name: antctl-linux-x86_64 - asset_content_type: application/octet-stream - - name: Upload antctl-windows-x86_64.exe - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antctl-windows-x86_64.exe - asset_name: antctl-windows-x86_64.exe - asset_content_type: application/octet-stream - - name: Upload antrea-octant-plugin-darwin-x86_64 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-octant-plugin-darwin-x86_64 - asset_name: antrea-octant-plugin-darwin-x86_64 - asset_content_type: application/octet-stream - - name: Upload antrea-octant-plugin-linux-arm - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-octant-plugin-linux-arm - asset_name: antrea-octant-plugin-linux-arm - asset_content_type: application/octet-stream - - name: Upload antrea-octant-plugin-linux-arm64 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-octant-plugin-linux-arm64 - asset_name: antrea-octant-plugin-linux-arm64 - asset_content_type: application/octet-stream - - name: Upload antrea-octant-plugin-linux-x86_64 - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-octant-plugin-linux-x86_64 - asset_name: antrea-octant-plugin-linux-x86_64 - asset_content_type: application/octet-stream - - name: Upload antrea-octant-plugin-windows-x86_64.exe - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-octant-plugin-windows-x86_64.exe - asset_name: antrea-octant-plugin-windows-x86_64.exe - asset_content_type: application/octet-stream - - name: Upload antrea.yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea.yml - asset_name: antrea.yml - asset_content_type: application/octet-stream - - name: Upload antrea-ipsec.yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-ipsec.yml - asset_name: antrea-ipsec.yml - asset_content_type: application/octet-stream - - name: Upload antrea-eks.yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-eks.yml - asset_name: antrea-eks.yml - asset_content_type: application/octet-stream - - name: Upload antrea-gke.yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-gke.yml - asset_name: antrea-gke.yml - asset_content_type: application/octet-stream - - name: Upload antrea-octant.yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-octant.yml - asset_name: antrea-octant.yml - asset_content_type: application/octet-stream - - name: Upload antrea-windows.yml - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./assets/antrea-windows.yml - asset_name: antrea-windows.yml - asset_content_type: application/octet-stream - name: Upload antrea-agent-windows-x86_64.exe uses: actions/upload-release-asset@v1 env: diff --git a/hack/release/prepare-assets.sh b/hack/release/prepare-assets.sh index 68fbf94895e..53185cc0e54 100755 --- a/hack/release/prepare-assets.sh +++ b/hack/release/prepare-assets.sh @@ -48,32 +48,7 @@ ANTREA_BUILDS=( "darwin amd64 darwin-x86_64" ) -for build in "${ANTREA_BUILDS[@]}"; do - args=($build) - os="${args[0]}" - arch="${args[1]}" - suffix="${args[2]}" - - GOOS=$os GOARCH=$arch ANTCTL_BINARY_NAME="antctl-$suffix" BINDIR="$OUTPUT_DIR"/ make antctl-release - cd ./plugins/octant && GOOS=$os GOARCH=$arch ANTREA_OCTANT_PLUGIN_BINARY_NAME="antrea-octant-plugin-$suffix" \ - BINDIR="$OUTPUT_DIR" make antrea-octant-plugin-release && cd ../.. -done - BINDIR="$OUTPUT_DIR" make windows-bin sed "s/AntreaVersion=\"latest\"/AntreaVersion=\"$VERSION\"/" ./hack/windows/Start.ps1 > "$OUTPUT_DIR"/Start.ps1 -export IMG_TAG=$VERSION - -export IMG_NAME=antrea/antrea-ubuntu -./hack/generate-manifest.sh --mode release > "$OUTPUT_DIR"/antrea.yml -./hack/generate-manifest.sh --mode release --ipsec > "$OUTPUT_DIR"/antrea-ipsec.yml -./hack/generate-manifest.sh --mode release --encap-mode networkPolicyOnly > "$OUTPUT_DIR"/antrea-eks.yml -./hack/generate-manifest.sh --mode release --cloud GKE --encap-mode noEncap > "$OUTPUT_DIR"/antrea-gke.yml - -export IMG_NAME=antrea/octant-antrea-ubuntu -./hack/generate-manifest-octant.sh --mode release > "$OUTPUT_DIR"/antrea-octant.yml - -export IMG_NAME=antrea/antrea-windows -./hack/generate-manifest-windows.sh --mode release > "$OUTPUT_DIR"/antrea-windows.yml - ls "$OUTPUT_DIR" | cat diff --git a/hack/windows/Helper.psm1 b/hack/windows/Helper.psm1 index 42eaf7626f3..6ebb6b27bf1 100644 --- a/hack/windows/Helper.psm1 +++ b/hack/windows/Helper.psm1 @@ -72,7 +72,7 @@ function Install-AntreaAgent { $AntreaAgent = "$AntreaHome\bin\antrea-agent.exe" $AntreaCNI = "$CNIPath\antrea.exe" $StopScript = "$AntreaHome\Stop.ps1" - $Owner = "vmware-tanzu" + $Owner = "ruicao93" $Repo = "antrea" $env:Path = "$KubernetesHome;" + $env:Path