Add function to install golang per AL version

Add an echo to find where GO_VERSION is being retreived

Remove else statement to check the if statement installs correct go version

Add logic to retreive AL2023 version

Remove quotes for variable definitions

Move go and AL23 variables to install phase

Remove qtrailing quotation mark for go variable

remove unused agent prometheus 'generic metrics' (aws#4225)

go mod tidy && go mod vendor

Author: Ephylouise

Makefile

@@ -108,19 +108,6 @@ docker-release: pause-container-release cni-plugins .out-stamp
 		--rm \
 		"amazon/amazon-ecs-agent-${BUILD}:make"
 
-# Make a Windows release target
-windows-docker-release: .out-stamp
-	@docker build --build-arg GO_VERSION=${GO_VERSION} -f scripts/dockerfiles/Dockerfile.cleanbuild -t "amazon/amazon-ecs-agent-cleanbuild-windows:make" .
-	@docker run --net=none \
-        --env TARGET_OS="windows" \
-        --env GO111MODULE=auto \
-        --user "$(USERID)" \
-        --volume "$(PWD)/out:/out" \
-        --volume "$(PWD):/src/amazon-ecs-agent" \
-        --rm \
-        "amazon/amazon-ecs-agent-cleanbuild-windows:make"
-
-
 # Legacy target : Release packages our agent into a "scratch" based dockerfile
 release: certs docker-release
 	@./scripts/create-amazon-ecs-scratch
@@ -241,7 +228,7 @@ build-ecs-cni-plugins:
 		-u "$(USERID)" \
 		-v "$(PWD)/out/amazon-ecs-cni-plugins:/go/src/github.com/aws/amazon-ecs-cni-plugins/bin/plugins" \
 		-v "$(ECS_CNI_REPOSITORY_SRC_DIR):/go/src/github.com/aws/amazon-ecs-cni-plugins" \
-		"amazon/amazon-ecs-build-ecs-cni-plugins:make"		
+		"amazon/amazon-ecs-build-ecs-cni-plugins:make"
 	@echo "Built amazon-ecs-cni-plugins successfully."
 
 build-vpc-cni-plugins:
@@ -399,15 +386,15 @@ get-deps-init:
 	GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/[email protected]
 	GO111MODULE=on go install honnef.co/go/tools/cmd/[email protected]
 
-amazon-linux-sources.tgz: get-cni-sources
+amazon-linux-sources.tgz:
 	./scripts/update-version.sh
 	cp packaging/amazon-linux-ami-integrated/ecs-agent.spec ecs-agent.spec
 	cp packaging/amazon-linux-ami-integrated/ecs.conf ecs.conf
 	cp packaging/amazon-linux-ami-integrated/ecs.service ecs.service
 	cp packaging/amazon-linux-ami-integrated/amazon-ecs-volume-plugin.conf amazon-ecs-volume-plugin.conf
 	cp packaging/amazon-linux-ami-integrated/amazon-ecs-volume-plugin.service amazon-ecs-volume-plugin.service
 	cp packaging/amazon-linux-ami-integrated/amazon-ecs-volume-plugin.socket amazon-ecs-volume-plugin.socket
-	tar -czf ./sources.tgz ecs-init scripts misc agent amazon-ecs-cni-plugins amazon-vpc-cni-plugins agent-container Makefile VERSION GO_VERSION
+	tar -czf ./sources.tgz ecs-init scripts misc agent amazon-ecs-cni-plugins amazon-vpc-cni-plugins agent-container Makefile VERSION RELEASE_COMMIT
 
 .amazon-linux-rpm-integrated-done: amazon-linux-sources.tgz
 	test -e SOURCES || ln -s . SOURCES

buildspecs/pr-build-ubuntu.yml

@@ -3,7 +3,7 @@ version: 0.2
 env:
   variables:
     # Github username of the forked repo on which to make builds
-    GITHUBUSERNAME: Ephylouise
+    GITHUBUSERNAME: aws
 
 phases:
   install:

buildspecs/pr-build.yml

@@ -49,7 +49,6 @@ phases:
       - WINDOWS_EXE="amazon-ecs-agent.exe"
       - echo $(pwd) 2>&1 | tee -a $BUILD_LOG
 
-
       # Path readjustment for codebuild testing with fork and setting GOPATH appropriately
       - echo "GitHub Username = $GITHUBUSERNAME" 2>&1 | tee -a $BUILD_LOG
       - cd ../../../..
@@ -73,15 +72,19 @@ phases:
 
       # Rename artifacts for architecture
       - |
-        if [[ $architecture == "arm64" ]]; then
+        if [[ $architecture == "arm64" ]] ; then
           mv $ECS_AGENT_TAR "ecs-agent-arm64-v${AGENT_VERSION}.tar"
           mv $CSI_DRIVER_TAR "./ecs-agent/daemonimages/csidriver/tarfiles/ebs-csi-driver-arm64.tar"
           ECS_AGENT_RPM="amazon-ecs-init-${AGENT_VERSION}-1.aarch64.rpm"
           ECS_AGENT_TAR="ecs-agent-arm64-v${AGENT_VERSION}.tar"
           CSI_DRIVER_TAR="./ecs-agent/daemonimages/csidriver/tarfiles/ebs-csi-driver-arm64.tar"
         fi
 
+<<<<<<< HEAD
       # List directory files to view artifacts in build log 
+=======
+       # List directory file to view artifacts in build log 
+>>>>>>> 9604f8e3b (Remove duplicate go version command)
       - ls
 
   post_build: