Fix debian packages

scripts/package/package-debian.sh

@@ -62,6 +62,14 @@ parseargs(){
             PREVIOUS_VERSION_URL=$2
             shift
             ;;
+        --framework-nuget-name)
+            SHARED_FRAMEWORK_NUGET_NAME=$2
+            shift
+            ;;
+        --framework-nuget-version)
+            SHARED_FRAMEWORK_NUGET_VERSION=$2
+            shift
+            ;;
         --obj-root)
             OBJECT_DIR=$2
             shift
@@ -118,6 +126,7 @@ rm -f "$PACKAGE_OUTPUT_DIR/*.deb"
 execute_build(){
     create_empty_debian_layout
     copy_files_to_debian_layout
+	update_debian_json
     create_debian_package
 }
 
@@ -158,15 +167,18 @@ create_debian_package(){
     "$PACKAGING_TOOL_DIR/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -v $DOTNET_CLI_VERSION -n $DOTNET_DEB_PACKAGE_NAME
 }
 
+update_debian_json()
+{
+    header "Updating debian.json file"
+    sed -i "s/%SHARED_FRAMEWORK_NUGET_NAME%/$SHARED_FRAMEWORK_NUGET_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
+    sed -i "s/%SHARED_FRAMEWORK_NUGET_VERSION%/$SHARED_FRAMEWORK_NUGET_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json
+}
+
 test_debian_package(){
     header "Testing debian package"
     
     install_bats
     run_package_integrity_tests
-
-    install_debian_package
-    run_e2e_test
-    remove_debian_package
 }
 
 install_bats() {
@@ -174,14 +186,6 @@ install_bats() {
     git clone https://github.com/sstephenson/bats.git $TEST_STAGE_DIR
 }
 
-install_debian_package() {
-    sudo dpkg -i $DEBIAN_FILE
-}
-
-remove_debian_package() {
-    sudo dpkg -r $DOTNET_DEB_PACKAGE_NAME
-}
-
 run_package_integrity_tests() {
     # Set LAST_VERSION_URL to enable upgrade tests
     export LAST_VERSION_URL="$PREVIOUS_VERSION_URL"
@@ -189,17 +193,6 @@ run_package_integrity_tests() {
     $TEST_STAGE_DIR/bin/bats $PACKAGE_OUTPUT_DIR/test_package.bats
 }
 
-run_e2e_test(){
-    local dotnet_path="/usr/bin/dotnet"
-
-    header "Running EndToEnd Tests against debian package using ${dotnet_path}"
-    
-    # Won't affect outer functions
-    cd $REPOROOT/test/EndToEnd
-    $dotnet_path build
-    $dotnet_path test -xml $TEST_STAGE_DIR/debian-endtoend-testResults.xml
-}
-
 execute_build
 
 DEBIAN_FILE=$(find $PACKAGE_OUTPUT_DIR -iname "*.deb")

scripts/package/package-sharedframework-debian.sh

@@ -127,7 +127,7 @@ update_debian_json()
 }
 
 test_debian_package(){
-    header "Testing debian package"
+    header "Testing debian Shared Framework package"
 
     install_bats
     run_package_integrity_tests

scripts/package/package-sharedhost-debian.sh

@@ -25,6 +25,7 @@ help(){
     echo "Options:"
     echo "  --input <input directory>          Package the entire contents of the directory tree."
     echo "  --output <output debfile>          The full path to which the package will be written."
+    echo "  --package-name <package name>      Package to identify during installation. Example - 'dotnet-sharedhost'"
     echo "  --obj-root <object root>           Root folder for intermediate objects."
     echo "  --version <version>                Version for the debain package."
     exit 1
@@ -41,6 +42,10 @@ while [[ $# > 0 ]]; do
             REPO_BINARIES_DIR=$2
             shift
             ;;
+        -p|--package-name)
+            SHARED_HOST_DEBIAN_PACKAGE_NAME=$2
+            shift
+            ;;
         --obj-root)
             OBJECT_DIR=$2
             shift
@@ -99,11 +104,11 @@ create_debian_package(){
 
     mkdir -p "$PACKAGE_OUTPUT_DIR"
 
-    "$PACKAGING_TOOL_DIR/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -v "$SHARED_HOST_DEBIAN_VERSION"
+    "$PACKAGING_TOOL_DIR/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -n "$SHARED_HOST_DEBIAN_PACKAGE_NAME" -v "$SHARED_HOST_DEBIAN_VERSION"
 }
 
 test_debian_package(){
-    header "Testing debian package"
+    header "Testing debian Shared Host package"
 
     install_bats
     run_package_integrity_tests