WinPB: Fix the Git installation for Windows #1047
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Willsparker
changed the title
sxa
approved these changes
Dec 20, 2019
sxa
pushed a commit
to sxa/infrastructure
that referenced
this pull request
Dec 20, 2019
* WinPB: Create Git properties file and use for installation * WinPB: Set autocrlf to false in Cygwin Git
sxa
pushed a commit
that referenced
this pull request
Jan 3, 2020
* WinPB: Create Git properties file and use for installation * WinPB: Set autocrlf to false in Cygwin Git
gdams
added a commit
to gdams/openjdk-infrastructure
that referenced
this pull request
Feb 26, 2020
* add first set of perf machines (adoptium#1038) * Fixed X11 Install from AIX Ansible Playbook (adoptium#969) * Added X11.vfb to AIX playbook * Adding XLC16 to aix playbook as its a requirement for JDK13 (adoptium#773) Signed-off-by: Joe deKoning <joe_dekoning@ca.ibm.com> * pbTests: Don't specify URL when git pulling (adoptium#1035) * pbTests: Don't specify URL when git pulling (adoptium#1035) * winPB: Change Git version to latest; use win_shell module (adoptium#1039) * UnixPB: Added retries to roles that often fail (adoptium#1011) * pbTests: Update testJDK.sh (adoptium#1040) * UnixPB: Changes so PB runs on Raspbian Buster (adoptium#1036) * pbTests: Find correct JDK versions for different OSs (adoptium#1034) Check and set correct Java_8 for CentOS And Ubuntu * pbTests: Refactor and clean-workspace option (adoptium#1030) * pbTests: Refactor and clean-workspace option * pbTests: Clean up checkLogFiles function * pbTests: Removal of -b option in the build and test commands * pbTests: Fixed pbFailed var assignment (adoptium#1046) * Passed the value of hosts from command line (adoptium#1017) - The variable groups['Vendor_groups'] is skipped due to lack of definition when we run AdoptOpenJDK Unix Playbook internally - Replaced it with a command line variable and set the value to all or a specific group [skip ci] Signed-off-by: Jenny Chen <Jenny.Chen@ibm.com> * pbTests: Altered Windows Scripts to build and test (adoptium#1053) * UnixPB: Debian Fixes + trailing space fix (adoptium#1052) * UnixPB: Fixed incorrectly named modules * Unix: Add Deb8 IP config for ansible, fix trailing space * pbTests: Put vagrant reload in the right place (adoptium#1055) * add missing swap_file tag (adoptium#1054) * add additional aarch64 test machines (adoptium#1050) * add additional aarch64 test machines * add missing deps * WinPB: Fix the Git installation for Windows (adoptium#1047) * WinPB: Create Git properties file and use for installation * WinPB: Set autocrlf to false in Cygwin Git * UnixPB: Add checksums to all `get_url` modules (adoptium#1051) * UnixPB: 1st Group of Checksums * UnixPB: 2nd Group of Checksums * Fix earlier swap_file tag indentation (adoptium#1057) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * WinPB: Added Checksums to win_get_url modules (adoptium#1058) * pbTests: Renamed testScript.sh (adoptium#1060) * Allow Debian8 as an option to vmDestroy.sh (adoptium#1064) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * PbTests: Updated READMEs relevant to the Test Scripts (adoptium#993) * Redraft and update ansible README.md (Phase 1!) (adoptium#1063) * PbTests: Updated READMEs relevant to the Test Scripts * Refactor and update ansible README.md Signed-off-by: Stewart Addison <sxa@uk.ibm.com> Co-authored-by: William Parker <52783864+Willsparker@users.noreply.github.com> * Made Deb8 VF find IP correctly (adoptium#1065) * Made Deb8 VF find IP correctly * Change Deb8 box * ansible: Add adoptopenjdk8 repository to Debian (adoptium#1068) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTestScripts: Add Debian8 reference and link to VagrantPlaybookCheck job (adoptium#1069) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * UnixPB: Update playbook to allow SLES12 to work (adoptium#1062) * VFs: Add FreeBSD12 and SLES12 Vagrantfiles (adoptium#1073) * VFs: Add FreeBSD12 VF * pbTest: Update vmDestroy.sh to include FBSD12 * VFs: Add SLES12 VF & Add to vmDestroy.sh * Use vagrantfiles from main repo by default, option to take from the alternate branch (adoptium#1070) * Don't use vagrant files from the branch under test Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTestScripts: Add option to use Vagrant files from the new branch Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * Fixup last commit which had wrong main Vagrantfile path (adoptium#1076) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * UnixPB: Remove 'group' tag from adoptopenjdk_install role (adoptium#1078) * UnixPB: Make changes so FreeBSD works (adoptium#1077) * pbTest: Run extended.system tests on Windows (adoptium#1079) * Update Marist zlinux inventory to the new z15 linux machines (adoptium#1041) * Add AIX71SP5TL5 machine for AIX JDK13+ builds Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * inventory: Replace Marist machines with new z15 versions Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTests: Fix 'checkVagrantOS' error message (adoptium#1080) * ansible: Switch adoptopenjdk downloads to APIv3 from APIv2 (adoptium#1074) * pbTests: add optional extra skip tags to speed up testing (adoptium#1082) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTests: ensure in correct directory to vagrant halt (adoptium#1089) * Add initial openjdk-infrastructure FAQ (adoptium#1066) * Add initial openjdk-infrastructure FAQ.md Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * typo fix * jenkins_user tag, instead of jenkins The Jenkins roles in the Unix playbook are tagged with "jenkins_user", not "jenkins" (if it's these roles you were going for) Co-authored-by: George Adams <george.adams@microsoft.com> Co-authored-by: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> * UnixPB: Fixes for FreeBSD12 (adoptium#1083) * UnixPB: Set vars for if undefined and remove unneeded tasks (adoptium#1092) * unixPB: Enable protobuf for OpenJ9 JITserver (adoptium#1094) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTests: Update buildJDK.sh to support FreeBSD & openSUSE (adoptium#1095) * pbTests: Update buildJDK.sh to support FreeBSD * pbTest: Set JAVA_HOME for FreeBSD * pbTests: Allow for openSUSE to be built * pbTests: Update testJDK.sh for FreeBSD * add build-macstadium-macos1014-1 (adoptium#1107) * Set Java 8 as Default in Alternatives for CentOS 6 Signed-off-by: Rajdeep Singh <rajdeep.singh@ibm.com> * Upgrade protobuf to v3.7.1 (adoptium#1112) Upgrade protobuf version from 3.5.1 to 3.7.1 and update the download link accordingly. Signed-off-by: Violeta Sebe <vsebe@ca.ibm.com> * inventory: Add new AIX systems (adoptium#1109) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * Added build tags to appropriate roles (adoptium#1100) * Added build tags to appropriate roles * change hosts back from all * test prereq packages for centos added * added libcurl-devel packages * Remove trailing spaces * UnixPB: Add support for OpenSUSE12.3 (adoptium#1101) * unixPB: Add support for OpenSUSE12.3 * pbTests: add SUSE12 to vmDestroy and remove SLES12 VF * unixPB: Enable protobuf for OpenJ9 JITserver (adoptium#1094) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTests: Update buildJDK.sh to support FreeBSD & openSUSE (adoptium#1095) * pbTests: Update buildJDK.sh to support FreeBSD * pbTest: Set JAVA_HOME for FreeBSD * pbTests: Allow for openSUSE to be built * pbTests: Update testJDK.sh for FreeBSD Co-authored-by: Stewart X Addison <sxa555@users.noreply.github.com> * unixPB: Passed CC/CXX to Protobuf build task (adoptium#1114) * winPB: Update checksums for win_get_url module (adoptium#1113) * winPB: Put checksum into correct format for win_get_url * winPB: Correct failing checksums * winPB: Changed Freemarker URL * Remove zulu-9 from Additional_Build_Tools var lists (adoptium#1116) * Remove zulu-9 from Additional_Build_Tools var lists * Remove tasks for adding zulu.repo * remove azul repo (adoptium#1117) * Set ansible_processor_vcpus for cmake role (adoptium#1110) Ensure ansible_processor_vcpus variable is inherited by cmake role when running tag only. Signed-off-by: Violeta Sebe <vsebe@ca.ibm.com> * vagrant: Temporarily use alternate openjdk-build branch (adoptium#1122) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTests: update testJDK.sh to not use run_configure.mk (adoptium#1123) * pbTests: Fixup last commit (adoptium#1126) * inventory: Add first 2 AWS Win2019 systems (adoptium#1130) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * updates to support RHEL 8 playbooks (adoptium#1129) * unixPB: Remove duplicate protobuf install (adoptium#1102) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * remove p7zip dependency on macOS (adoptium#1137) * More aix machines woohoo (adoptium#1115) * inventory: Add new AIX systems Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * inventory: Add AIX machines correctly Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * UnixPB: Remove CPAN role (adoptium#1136) * UnixPB: Remove CPAN role * Removed additional seperate packages * VFs: Ref adoptium#685 non-zero exit status fix (adoptium#1144) * UnixPB: Add support for SLES15-SP0 (adoptium#1140) * UnixPB: Add support for SLES15-SP0 * Remove ntp and enable chronyd for SLES15 * winPB: Passed the value of hosts from command line (adoptium#1075) * apply change to windows playbook as performed in adoptium#1017 * adoptium#423 Signed-off-by: Joe deKoning <joe_dekoning@ca.ibm.com> * UnixPB: remove sudo from GIT_SOURCE role (adoptium#1147) * ansible: Remove old gcc 7 locations for Protobuf role Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * UnixPB: Add support for CentOS8 (adoptium#1131) * UnixPB: Add support for CentOS8 * Add CentOS8 as vmDestroy option * win: Adjust cygwin setup checksum as it's been updated (adoptium#1149) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * pbTests: Change buildJDK to build from other URLs (adoptium#1152) * pbTests: Change buildJDK to be able to build JDKs 8-14 * Add various options to buildJDK.sh * Make build openj9 by default * pbTests: Add script to test U18 on s390x/ppc64le QEMU VMs (adoptium#1119) * pbTests: Initial commit of qemu_test_script * Add 'fastmode' to qemu script * PB: Add qemu to vagrant.yml * Make ppc64le machine as pseries-2.12 * Correct expect path; Add expect to vagrant.yml * Remove use of expect_script * Build Qemu 4.2; Add arguments to 'ps' * Ensure script stops if playbook fails * Add multi-core support to the qemu VMs * Fix syntax error * Update port detection logic to use netstat * Increase RAM on qemu systems as 1Gb is mean for SMP4 * Use xz compressed base images from /qemu_base_images * alter testJDK to accept other architectures * changes to allow for U18 s390x to work * Change infra repo to run playbook from * Add back in checksum Co-authored-by: Stewart X Addison <sxa555@users.noreply.github.com> * pbTests: Change URLs to run the playbook from (adoptium#1156) * UnixPB: Remove pulseaudio from Common/vars/SLES.yml (adoptium#1157) * playbook: Update gcc-7 role to install gcc 7.5 (adoptium#1158) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * Ram increase for Vagrant VMs (adoptium#1081) * Vagrant: 4GB of RAM, 50% CPU cap * Vagrant: Adjust RAM down to 2.5Gb * winPB: Change checksum for MSVS_2017 (adoptium#1162) * unixPB: Remove repeat in SLES package list (adoptium#1161) * unixPB: Remove checksum for gcc_7 task (adoptium#1160) * winPB: Switch adoptopenjdk download to use APIv3 (adoptium#1167) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * unixPB: Remove devtoolset-7 and require Adopt's GCC7.5 (adoptium#1166) Signed-off-by: Stewart Addison <sxa@uk.ibm.com> * unixPB: Alter adoptopenjdk_install role to allow for jdk8 (adoptium#1138) * unixPB: Alter adoptopenjdk_install to let jdk8 * Alter adoptopenjdk_install to exclude macOS * pbTests: Added option to specify openjdk-build repo (adoptium#1170) * add dockerfiles for aws codebuild Co-authored-by: Pav Salimon <32314784+olvap377@users.noreply.github.com> Co-authored-by: Joe deKoning <joe_dekoning@ca.ibm.com> Co-authored-by: William Parker <52783864+Willsparker@users.noreply.github.com> Co-authored-by: Jenny Chen <41126207+JennyChenyj@users.noreply.github.com> Co-authored-by: Stewart X Addison <sxa555@users.noreply.github.com> Co-authored-by: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Co-authored-by: Rajdeep Singh <56080803+rajdeepsingh1@users.noreply.github.com> Co-authored-by: vsebe <vsebe@ca.ibm.com> Co-authored-by: Sej <41746002+sej-jackson@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: #1023
The issue is that the way Git is being installed means it will be changing the line endings as
git cloneis happening on a windows machine. This PR will change the git config so that it won't change the line endings.As it's unclear whether the
gitbeing used is from Cygwin, or "git-for-windows", so this PR will contain changes to both roles, as there's no benefit to them converting the line endings for Windows in our situation anyway.git-for-windows: This involves creating a config file for the installation to use to determine settings.
Cygwin: Once installation of Cygwin and its packages are done, a task will change the
.gitconfigthat's there once Cygwin is installed. Git falls under theDevelcategory of Cygwin Packages being installed, and in the playbooks current form, the installation properties can't be specified like it can in git-for-windows.Note: The git download task in git-for-windows has changed as this was incorrectly changed prior (#1039). The issue that that PR was attempting to fix is an upstream issue with Ansible's
win_get_urlmodule and will supposedly be fixed on release of Ansible 2.9.3.