Setup pipelines in introspection tests file

tests/functions.sh

@@ -222,11 +222,11 @@ function storage_account_table_exists () {
             done
         fi
      else
-        echo "The table $sa_name does not exist"
-        if [ "$action" == "fail" ]; then
+        echo "Check if $t exists"
+        if [ "$action" = "fail" ]; then
             exit 1
         fi
-        if [ "$action" == "create" ]; then
+        if [ "$action" = "create" ]; then
             echo "Create table $t"
             az storage table create -n $t --account-name $sa_name
             total_wait_seconds=20

tests/introspection-validations.sh

@@ -35,16 +35,210 @@ sa_location=westus
 kv_name=fabrikamkv
 kv_location=westus
 
+# Introspection Storage Account Setup
+sa_partition_key="integration-test"
+
+branchName=myFeatureBranch
+FrontEnd=fabrikam.acme.frontend
+BackEnd=fabrikam.acme.backend
+hld_dir=fabrikam-intro-hld
+manifests_dir=fabrikam-manifests
+vg_name=fabrikam-intro-vg
+services_dir=services
+mono_repo_dir=fabrikamintro2019
+services_full_dir="$TEST_WORKSPACE/$mono_repo_dir/$services_dir"
+
 shopt -s expand_aliases
 alias spk=$SPK_LOCATION
 echo "SPK Version: $(spk --version)"
 echo "Running from $(pwd)"
 
+echo "Running from $(pwd)"
+if [ -d "$TEST_WORKSPACE"  ]; then rm -Rf $TEST_WORKSPACE; fi
+
+if [ ! -d "$TEST_WORKSPACE" ]; then
+  echo "Directory '$TEST_WORKSPACE' does not exist"
+  mkdir $TEST_WORKSPACE
+  echo "Created '$TEST_WORKSPACE'"
+fi
+
+cd $TEST_WORKSPACE
+
 # spk deployment onboard validation test
+sat_onboard_name=deployments
+subscription_id=$(az account list | jq '.[] | select(.isDefault == true) | .id' -r)
+storage_account_exists $AZ_STORAGE_ACCOUNT $AZ_RESOURCE_GROUP "fail"
+storage_account_table_exists $sat_onboard_name $AZ_STORAGE_ACCOUNT "delete"
+spk deployment onboard -s $AZ_STORAGE_ACCOUNT -t $sat_onboard_name -l $sa_location -r $AZ_RESOURCE_GROUP --subscription-id $subscription_id --service-principal-id $SP_APP_ID --service-principal-password $SP_PASS --tenant-id $SP_TENANT
+storage_account_table_exists $sat_onboard_name $AZ_STORAGE_ACCOUNT "fail"
+storage_account_table_exists $sat_onboard_name $AZ_STORAGE_ACCOUNT "delete"
+
+echo "Successfully validated spk deployment onboard."
+
+# setup repo with pipelines
+# Manifest Repo Setup ------------------
+mkdir $manifests_dir
+cd $manifests_dir
+git init
+touch README.md
+echo "This is the Flux Manifest Repository." >> README.md
+file_we_expect=("README.md")
+validate_directory "$TEST_WORKSPACE/$manifests_dir" "${file_we_expect[@]}"
+
+git add -A
+
+# See if the remote repo exists
+repo_exists $AZDO_ORG_URL $AZDO_PROJECT $manifests_dir
+
+# Create the remote repo for the local repo
+created_repo_result=$(az repos create --name "$manifests_dir" --org $AZDO_ORG_URL --p $AZDO_PROJECT)
+
+# Extract out remote repo URL from the above result
+remote_repo_url=$(echo $created_repo_result | jq '.remoteUrl' | tr -d '"' )
+echo "The remote_repo_url is $remote_repo_url"
+
+# Remove the user from the URL
+repo_url=$(getHostandPath "$remote_repo_url")
+manifest_repo_url=$repo_url
+
+# We need to manipulate the remote url to insert a PAT token so we can add an origin git url
+git commit -m "inital commit"
+# git remote rm origin
+git remote add origin https://service_account:$ACCESS_TOKEN_SECRET@$repo_url
+echo "git push"
+git push -u origin --all
+cd ..
+
+# HLD repo set up -----------------------
+mkdir $hld_dir
+cd $hld_dir
+git init
+spk hld init
+touch component.yaml
+file_we_expect=("spk.log" "manifest-generation.yaml" "component.yaml" ".gitignore")
+validate_directory "$TEST_WORKSPACE/$hld_dir" "${file_we_expect[@]}"
+
+git add -A
+
+# See if the remote repo exists
+repo_exists $AZDO_ORG_URL $AZDO_PROJECT $hld_dir
+
+# Create the remote repo for the local repo
+created_repo_result=$(az repos create --name "$hld_dir" --org $AZDO_ORG_URL --p $AZDO_PROJECT)
+
+# Extract out remote repo URL from the above result
+remote_repo_url=$(echo $created_repo_result | jq '.remoteUrl' | tr -d '"' )
+echo "The remote_repo_url is $remote_repo_url"
+
+# Remove the user from the URL
+repo_url=$(getHostandPath "$remote_repo_url")
+hld_repo_url=$repo_url
+
+# We need to manipulate the remote url to insert a PAT token so we can add an origin git url
+git commit -m "inital commit"
+# git remote rm origin
+git remote add origin https://service_account:$ACCESS_TOKEN_SECRET@$repo_url
+echo "git push"
+git push -u origin --all
+cd ..
+
+# *** TODO: Get rid of duplication
+
+# First we should check hld pipelines exist. If there is a pipeline with the same name we should delete it
+hld_to_manifest_pipeline_name=$hld_dir-to-$manifests_dir
+pipeline_exists $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name
+
+# Create the hld to manifest pipeline
+echo "hld_dir $hld_dir"
+echo "hld_repo_url $hld_repo_url"
+echo "manifest_repo_url $manifest_repo_url"
+spk hld install-manifest-pipeline -o $AZDO_ORG -d $AZDO_PROJECT -p $ACCESS_TOKEN_SECRET -r $hld_dir -u https://$hld_repo_url -m https://$manifest_repo_url >> $TEST_WORKSPACE/log.txt
+
+# Verify hld to manifest pipeline was created
+pipeline_created=$(az pipelines show --name $hld_to_manifest_pipeline_name --org $AZDO_ORG_URL --p $AZDO_PROJECT)
+
+# Verify hld to manifest pipeline run was successful
+verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 300 15
+
+# App Code Mono Repo set up 
+mkdir $mono_repo_dir
+cd $mono_repo_dir
+git init
+
+mkdir $services_dir
+spk project init >> $TEST_WORKSPACE/log.txt
+file_we_expect=("spk.log" ".gitignore" "bedrock.yaml" "maintainers.yaml" "hld-lifecycle.yaml")
+validate_directory "$TEST_WORKSPACE/$mono_repo_dir" "${file_we_expect[@]}"
+
+# Does variable group already exist? Delete if so
+variable_group_exists $AZDO_ORG_URL $AZDO_PROJECT $vg_name "delete"
+
+# Create variable group
+spk project create-variable-group $vg_name -r $ACR_NAME -d $hld_repo_url -u $SP_APP_ID -t $SP_TENANT -p $SP_PASS --org-name $AZDO_ORG --project $AZDO_PROJECT --personal-access-token $ACCESS_TOKEN_SECRET  >> $TEST_WORKSPACE/log.txt
+
+# Verify the variable group was created. Fail if not
+variable_group_exists $AZDO_ORG_URL $AZDO_PROJECT $vg_name "fail"
+
+# Introspection Storage Account Setup
 storage_account_exists $AZ_STORAGE_ACCOUNT $AZ_RESOURCE_GROUP "fail"
-storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "delete"
-spk deployment onboard -s $AZ_STORAGE_ACCOUNT -t $sat_name -l $sa_location -r $AZ_RESOURCE_GROUP --subscription-id $AZ_SUBSCRIPTION_ID --service-principal-id $SP_APP_ID --service-principal-password $SP_PASS --tenant-id $SP_TENANT
+storage_account_cors_enabled $AZ_STORAGE_ACCOUNT "enable"
+storage_account_cors_enabled $AZ_STORAGE_ACCOUNT "wait"
+storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "create"
 storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "fail"
-storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "delete"
+sa_access_key=$(az storage account keys list -n $AZ_STORAGE_ACCOUNT -g $AZ_RESOURCE_GROUP | jq '.[0].value')
+
+# Add introspection variables to variable group
+variable_group_id=$(az pipelines variable-group list --org $AZDO_ORG_URL -p $AZDO_PROJECT | jq '.[] | select(.name=="fabrikam-intro-vg") | .id')
+variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "ACCOUNT_KEY" $sa_access_key "secret"
+variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "ACCOUNT_NAME" $AZ_STORAGE_ACCOUNT
+variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "PARTITION_KEY" $sa_partition_key
+variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "TABLE_NAME" $sat_name
+
+spk service create $FrontEnd -d $services_dir >> $TEST_WORKSPACE/log.txt
+directory_to_check="$services_full_dir/$FrontEnd"
+file_we_expect=(".gitignore" "azure-pipelines.yaml" "Dockerfile" )
+validate_directory $directory_to_check "${file_we_expect[@]}"
+
+spk service create $BackEnd -d $services_dir >> $TEST_WORKSPACE/log.txt
+validate_directory "$services_full_dir/$BackEnd" "${file_we_expect[@]}"
+
+git add -A
+
+# TODO: We aren't using the config file right now
+# spk init -f $SPK_CONFIG_FILE
+
+# See if the remote repo exists
+repo_exists $AZDO_ORG_URL $AZDO_PROJECT $mono_repo_dir
+
+# Create the remote repo for the local repo
+created_repo_result=$(az repos create --name "$mono_repo_dir" --org $AZDO_ORG_URL --p $AZDO_PROJECT)
+
+# Extract out remote repo URL from the above result
+remote_repo_url=$(echo $created_repo_result | jq '.remoteUrl' | tr -d '"' )
+echo "The remote_repo_url is $remote_repo_url"
+
+# Remove the user from the URL
+repo_url=$(getHostandPath "$remote_repo_url")
+
+# We need to manipulate the remote url to insert a PAT token so we can
+
+git commit -m "inital commit"
+git remote add origin https://service_account:$ACCESS_TOKEN_SECRET@$repo_url
+echo "git push"
+git push -u origin --all
+
+# First we should check lifecycle pipelines exist. If there is a pipeline with the same name we should delete it
+lifecycle_pipeline_name="$mono_repo_dir-lifecycle"
+pipeline_exists $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name
+
+# Deploy lifecycle pipeline and verify it runs.
+spk project install-lifecycle-pipeline --org-name $AZDO_ORG --devops-project $AZDO_PROJECT --repo-url $repo_url --repo-name $mono_repo_dir --pipeline-name $lifecycle_pipeline_name --personal-access-token $ACCESS_TOKEN_SECRET  >> $TEST_WORKSPACE/log.txt
+
+# TODO: Verify the lifecycle pipeline sucessfully runs
+# Verify lifecycle pipeline was created
+pipeline_created=$(az pipelines show --name $lifecycle_pipeline_name --org $AZDO_ORG_URL --p $AZDO_PROJECT)
+
+# Verify lifecycle pipeline run was successful
+verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 180 15
 
 echo "Successfully reached the end of the introspection validations script."

tests/validations.sh

@@ -53,17 +53,6 @@ fi
 
 cd $TEST_WORKSPACE
 
-# Introspection Storage Account Setup
-# sat_name=fabrikamdeployments
-# sa_partition_key="integration-test"
-
-# storage_account_exists $AZ_STORAGE_ACCOUNT $AZ_RESOURCE_GROUP "fail"
-# storage_account_cors_enabled $AZ_STORAGE_ACCOUNT "enable"
-# storage_account_cors_enabled $AZ_STORAGE_ACCOUNT "wait"
-# storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "create"
-# storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "fail"
-# sa_access_key=$(az storage account keys list -n $AZ_STORAGE_ACCOUNT -g $AZ_RESOURCE_GROUP | jq '.[0].value')
-
 # Manifest Repo Setup ------------------
 mkdir $manifests_dir
 cd $manifests_dir
@@ -167,13 +156,6 @@ spk project create-variable-group $vg_name -r $ACR_NAME -d $hld_repo_url -u $SP_
 # Verify the variable group was created. Fail if not
 variable_group_exists $AZDO_ORG_URL $AZDO_PROJECT $vg_name "fail"
 
-# Add introspection variables to variable group
-# variable_group_id=$(az pipelines variable-group list --org $AZDO_ORG_URL -p $AZDO_PROJECT | jq '.[] | select(.name=="fabrikam-vg") | .id')
-# variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "ACCOUNT_KEY" $sa_access_key "secret"
-# variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "ACCOUNT_NAME" $AZ_STORAGE_ACCOUNT
-# variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "PARTITION_KEY" $sa_partition_key
-# variable_group_variable_create $variable_group_id $AZDO_ORG_URL $AZDO_PROJECT "TABLE_NAME" $sat_name
-
 spk service create $FrontEnd -d $services_dir >> $TEST_WORKSPACE/log.txt
 directory_to_check="$services_full_dir/$FrontEnd"
 file_we_expect=(".gitignore" "azure-pipelines.yaml" "Dockerfile" )