Skip to content

Commit d886675

Browse files
committed
chef update
1 parent b44fa4b commit d886675

File tree

1 file changed

+1
-35
lines changed

1 file changed

+1
-35
lines changed

ci-ubuntu-2204.yml

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,6 @@ variables:
1515
travis_vpc_id: "{{ env `TRAVIS_VPC_ID` }}"
1616
travis_source_ami: "{{ env `TRAVIS_SOURCE_AMI` }}"
1717
builders:
18-
- type: amazon-ebs
19-
name: amazon-ebs
20-
access_key: "{{ user `aws_access_key` }}"
21-
secret_key: "{{ user `aws_secret_key` }}"
22-
region: us-east-1
23-
source_ami: "{{ user `travis_source_ami` }}"
24-
ami_name: travis-ci-worker {{ isotime "2006-01-02 15:04:06" | clean_ami_name }}
25-
instance_type: m6g.xlarge
26-
ssh_username: ubuntu
27-
ami_virtualization_type: hvm
28-
tags:
29-
role: worker
30-
associate_public_ip_address: true
31-
subnet_id: "{{ user `travis_subnet_id` }}"
32-
vpc_id: "{{ user `travis_vpc_id` }}"
33-
source_ami_filter:
34-
owners:
35-
- 099720109477
3618
- type: googlecompute
3719
name: googlecompute
3820
communicator: ssh
@@ -53,12 +35,6 @@ builders:
5335
- ci
5436
- ubuntu-2204
5537
- travis-ci-packer-templates
56-
- type: lxd
57-
name: lxd
58-
image: ubuntu:jammy #identifier of image taken from https://us.images.linuxcontainers.org/
59-
output_image: "{{ user `image_name` }}"
60-
publish_properties:
61-
- description: Travis CI jammy build env template!
6238
- type: docker
6339
name: docker
6440
ssh_pty: true
@@ -103,7 +79,6 @@ provisioners:
10379
destination: /var/tmp/packages.txt
10480
only:
10581
- googlecompute
106-
- lxd
10782
- type: file
10883
source: packer-assets/ci-ubuntu-2204-docker-packages.txt
10984
destination: /var/tmp/packages.txt
@@ -136,7 +111,7 @@ provisioners:
136111
- type: shell
137112
inline: chmod 0644 /var/tmp/ubuntu-2204-system-info-commands.yml
138113
- type: chef-solo
139-
version: 17.10.3
114+
version: 18.4.12
140115
config_template: chef-solo.rb.tmpl
141116
<% if ENV['CHEF_PROFILING'] %>
142117
execute_command: "{{if .Sudo}}sudo {{end}}CI=yes chef-solo --chef-license accept-silent -F doc --no-color -c {{.ConfigPath}} -j {{.JsonPath}}"
@@ -184,15 +159,6 @@ provisioners:
184159
- TRAVIS_OBFUSCATE_PASSWORD=1
185160
- TRAVIS_UID={{ user `travis_uid` }}
186161
execute_command: "{{ .Vars }} exec sudo -E -S bash '{{ .Path }}'"
187-
#- type: shell
188-
# environment_vars:
189-
# - TRAVIS_OBFUSCATE_PASSWORD=1
190-
# - TRAVIS_UID={{ user `travis_uid` }}
191-
# execute_command: "{{ .Vars }} exec sudo -E -S bash '{{ .Path }}'"
192-
# inline:
193-
# - "find /etc/systemd -type f -o -type l"
194-
# # - "rm -v /etc/systemd/system/network-online.target.wants/networking.service"
195-
# # - "rm -v /etc/systemd/system/multi-user.target.wants/networking.service"
196162
# STILL ISSUE WITH COUCHDB 2024
197163
# - type: shell
198164
# inline: "sudo chown -R couchdb:couchdb /opt/couchdb/"

0 commit comments

Comments
 (0)