Testing release workflow<Do-not-merge>

aws · Jul 23, 2021 · 7823d54 · 7823d54
1 parent c49f1d6
commit 7823d54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,5 +22,5 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
-    - name: Create eks-charts PR
-      run: make ekscharts-sync-release
+    - name: Attach release artifacts 
+      run: make release
diff --git a/scripts/generate-cni-yaml.sh b/scripts/generate-cni-yaml.sh
@@ -20,7 +20,6 @@ CNI_RESOURCES_YAML=$BUILD_DIR/aws-vpc-cni
 METRICS_RESOURCES_YAML=$BUILD_DIR/cni-metrics-helper
 CALICO_OPERATOR_RESOURCES_YAML=$BUILD_DIR/calico-operator.yaml
 CALICO_CRS_RESOURCES_YAML=$BUILD_DIR/calico-crs.yaml
-TEMP_YAML=$BUILD_DIR/temp.yaml
 
 mkdir -p $INDV_RESOURCES_DIR
 

diff --git a/scripts/upload-resources-to-github.sh b/scripts/upload-resources-to-github.sh
@@ -13,6 +13,8 @@ CALICO_TAR_RESOURCES_FILE=$BUILD_DIR/calico_individual-resources.tar
 CNI_RESOURCES_YAML=$BUILD_DIR/aws-vpc-cni
 METRICS_RESOURCES_YAML=$BUILD_DIR/cni-metrics-helper
 CALICO_RESOURCES_YAML=$BUILD_DIR/calico.yaml
+CALICO_OPERATOR_RESOURCES_YAML=$BUILD_DIR/calico-operator.yaml
+CALICO_CRS_RESOURCES_YAML=$BUILD_DIR/calico-crs.yaml
 REGIONS_FILE=$SCRIPTPATH/../charts/regions.json
 
 BINARIES_ONLY="false"
@@ -113,7 +115,7 @@ jq -c '.[]' $REGIONS_FILE | while read i; do
     done
 done    
 
-RESOURCES_TO_UPLOAD=("$CALICO_RESOURCES_YAML" "$CNI_TAR_RESOURCES_FILE" "$METRICS_TAR_RESOURCES_FILE" "$CALICO_TAR_RESOURCES_FILE")
+RESOURCES_TO_UPLOAD=("$CALICO_OPERATOR_RESOURCES_YAML" "CALICO_CRS_RESOURCES_YAML" "$CNI_TAR_RESOURCES_FILE" "$METRICS_TAR_RESOURCES_FILE" "$CALICO_TAR_RESOURCES_FILE")
 
 COUNT=1
 echo -e "\nUploading release assets for release id '$RELEASE_ID' to Github"