add new

1.sh

@@ -5,3 +5,5 @@ do
     echo "$item"
     autorest --ansible --use=./  "$item"/resource-manager/readme.md  --log --ansible-output-folder=../tmp
 done
+echo "This is test programe"
+

2.log

@@ -0,0 +1,106 @@
+ d5a354f4430ae820adbc3daf281f86f0e743cf62
+ApplicationGateways
+ ApplicationGatewayPrivateLinkResources
+ ApplicationGatewayPrivateEndpointConnections
+ ApplicationSecurityGroups
+ AvailableDelegations
+ AvailableResourceGroupDelegations
+ AvailableServiceAliases
+ AzureFirewalls
+ AzureFirewallFqdnTags
+ WebCategories
+ BastionHosts
+ CustomIPPrefixes
+ DdosCustomPolicies
+ DdosProtectionPlans
+ DscpConfiguration
+ AvailableEndpointServices
+ ExpressRouteCircuitAuthorizations
+ ExpressRouteCircuitPeerings
+ ExpressRouteCircuitConnections
+ PeerExpressRouteCircuitConnections
+ ExpressRouteCircuits
+ ExpressRouteServiceProviders
+ ExpressRouteCrossConnections
+ ExpressRouteCrossConnectionPeerings
+ ExpressRoutePortsLocations
+ ExpressRoutePorts
+ ExpressRouteLinks
+ FirewallPolicies
+ FirewallPolicyRuleCollectionGroups
+ IpAllocations
+ IpGroups
+ LoadBalancers
+ LoadBalancerBackendAddressPools
+ LoadBalancerFrontendIPConfigurations
+ InboundNatRules
+ LoadBalancerLoadBalancingRules
+ LoadBalancerOutboundRules
+ LoadBalancerNetworkInterfaces
+ LoadBalancerProbes
+ NatGateways
+ NetworkInterfaces
+ NetworkInterfaceIPConfigurations
+ NetworkInterfaceLoadBalancers
+ NetworkInterfaceTapConfigurations
+ NetworkProfiles
+ NetworkSecurityGroups
+ SecurityRules
+ DefaultSecurityRules
+ NetworkVirtualAppliances
+ VirtualApplianceSites
+ VirtualApplianceSkus
+ InboundSecurityRule
+ NetworkWatchers
+ PacketCaptures
+ ConnectionMonitors
+ FlowLogs
+ Operations
+ PrivateEndpoints
+ AvailablePrivateEndpointTypes
+ PrivateDnsZoneGroups
+ PrivateLinkServices
+ PublicIPAddresses
+ PublicIPPrefixes
+ RouteFilters
+ RouteFilterRules
+ RouteTables
+ Routes
+ SecurityPartnerProviders
+ BgpServiceCommunities
+ ServiceEndpointPolicies
+ ServiceEndpointPolicyDefinitions
+ ServiceTags
+ Usages
+ VirtualNetworks
+ Subnets
+ ResourceNavigationLinks
+ ServiceAssociationLinks
+ VirtualNetworkPeerings
+ VirtualNetworkGateways
+ VirtualNetworkGatewayConnections
+ LocalNetworkGateways
+ VirtualNetworkTaps
+ VirtualRouters
+ VirtualRouterPeerings
+ VirtualWans
+ VpnSites
+ VpnSiteLinks
+ VpnSitesConfiguration
+ VpnServerConfigurations
+ VirtualHubs
+ HubVirtualNetworkConnections
+ VpnGateways
+ VpnConnections
+ VpnSiteLinkConnections
+ VpnLinkConnections
+ P2sVpnGateways
+ VpnServerConfigurationsAssociatedWithVirtualWan
+ VirtualHubRouteTableV2s
+ ExpressRouteGateways
+ ExpressRouteConnections
+ VirtualHubBgpConnection
+ VirtualHubBgpConnections
+ VirtualHubIpConfiguration
+ HubRouteTables
+ WebApplicationFirewallPolicies

2.sh

@@ -0,0 +1,4 @@
+while read line
+do 
+    echo $line
+done < 2.log

add.sh

@@ -2,3 +2,4 @@ echo "test"
 echo "pass"
 echo $1
 echo "Hello World"
+echo "Hello World"

azure-pipelines.yml

@@ -6,6 +6,19 @@ parameters:
 - name: PYTHON_VER
   displayName: 'Python Version'
   type: string
+<<<<<<< HEAD
+  default: "2.7"
+  values:
+  - "2.7"
+  - "3.6"
+- name: ANSIBLE_VER
+  displayName: 'Ansible Version'
+  type: string
+  default: "2.9.0"
+  values:
+  - "2.9.0"
+  - "2.10.0"
+=======
   default: python2
   values:
   - python3
@@ -18,6 +31,7 @@ parameters:
   values:
   - 9
   - 10
+>>>>>>> 6b54757fc54cbf179545d1488a54034ba6e6ab91
 
 trigger:
 - master
@@ -31,6 +45,12 @@ steps:
 - script: echo ${{ parameters.PYTHON_VER }} and ${{ parameters.ANSIBLE_VER }}
   displayName: 'Get predefine parameter'
 
+<<<<<<< HEAD
+- script: echo Python${{ parameters.PYTHON_VER }} and ${{ parameters.ANSIBLE_VER }}
+  displayName: 'Get predefine parameter'
+
+=======
+>>>>>>> 6b54757fc54cbf179545d1488a54034ba6e6ab91
 - script: |
     echo Add other tasks to build, test, and deploy your project.
     echo See https://aka.ms/yaml