refresh

Author: goneri

playbook.yml

@@ -16,6 +16,19 @@
     - debug: var=ansible_distribution
     - debug: var=ansible_distribution_major_version
     - debug: var=ansible_distribution_version
+    - when: image_os == "dragonflybsd"
+      block:
+      - name: "DFly/pkg turn off SSL, see https://www.reddit.com/r/dragonflybsd/comments/q9xowg/certificate_verification_failed_for_odigital/hh0a01s/"
+        command: sed -i.bak 's,https,http,' /usr/local/etc/pkg/repos/df-latest.conf
+        become: true
+      - name: upgrade and install git
+        shell: |
+          pkg update
+          pkg upgrade -y || true
+          pkg upgrade -y || true
+          pkg install -y git || true
+          pkg install -y git
+        become: true
     - when: ansible_distribution == 'OpenBSD' and ansible_distribution_version != image_version|string
       block:
       - name: Upgrade OpenBSD
@@ -27,24 +40,26 @@
       - name: Upgrade packages
         command: pkg_add -uvi
         become: true
-    - name: install the dependencies
-      shell: "/usr/sbin/pkg_add -U {{ item }}"
-      with_items: '{{ dependencies }}'
-      become: true
-      environment:
-          PKG_PATH: 'http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/{{ ansible_machine }}/{{ ansible_distribution_release }}/All/'
-      when: ansible_os_family == "NetBSD"
-    - name: Install the rootcerts
-      command: /usr/pkg/sbin/mozilla-rootcerts install
-      become: true
-      args:
-        creates: /etc/openssl/certs/ca-certificates.crt
-      when: ansible_os_family == "NetBSD"
+    - when: ansible_os_family == "NetBSD"
+      block:
+      - name: install the dependencies
+        shell: "/usr/sbin/pkg_add -U {{ item }}"
+        with_items: '{{ dependencies }}'
+        become: true
+        environment:
+            PKG_PATH: 'http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/{{ ansible_machine }}/{{ ansible_distribution_release }}/All/'
+      - name: Install the rootcerts
+        command: /usr/pkg/sbin/mozilla-rootcerts install
+        become: true
+        args:
+          creates: /etc/openssl/certs/ca-certificates.crt
+
     - name: install the dependencies
       package:
           name: '{{ dependencies }}'
       become: true
       when: ansible_os_family != "NetBSD"
+
     - command: git config --global http.sslVerify false
     - name: Fetch the builder script
       git:
@@ -100,7 +115,7 @@
 
     - assert:
         that:
-          - hostvars.newvm.ansible_dns.nameservers == ['192.168.123.1']
+          - "'192.168.123.1' in hostvars.newvm.ansible_dns.nameservers"
 
     - assert:
         that:

promote.yaml

@@ -3,30 +3,49 @@
   vars:
     www_dir: /var/www/bsd-cloud-image.org/images
     dest_dir: '{{ www_dir }}/{{ image_os }}/{{ image_version }}'
+    qcow2_swift_path: "images/{{ image_os }}/{{ image_version}}/{{ ansible_date_time.date }}/{{ final_name }}.qcow2"
+    yaml_swift_path: "images/{{ image_os }}/{{ image_version}}/{{ ansible_date_time.date }}/{{ final_name }}.yaml"
   tasks:
     - file:
         path: '{{ dest_dir }}'
         state: directory
         recurse: true
       become: true
-    - name: Promote the new image (1/4)
+    - name: Promote the new image Virt-Lightning (1/4)
       command: 'mv /var/lib/virt-lightning/pool/upstream/{{ final_name }}_exp.qcow2 {{ dest_dir }}/{{ final_name }}.qcow2'
       become: true
-    - name: Promote the new image (yaml) (2/4)
+    - name: Promote the new image Virt-Lightning (yaml) (2/4)
       command: 'mv /var/lib/virt-lightning/pool/upstream/{{ final_name }}_exp.yaml {{ dest_dir }}/{{ final_name }}.yaml'
       become: true
-    - name: Promote the new image (3/4)
+    - name: Promote the new image Virt-Lightning (3/4)
       command: 'cp {{ dest_dir }}/{{ final_name }}.qcow2 /var/lib/virt-lightning/pool/upstream/{{ final_name }}.qcow2'
       become: true
-    - name: Promote the new image (yaml) (4/4)
+    - name: Promote the new image Virt-Lightning (yaml) (4/4)
       command: 'cp {{ dest_dir }}/{{ final_name }}.yaml /var/lib/virt-lightning/pool/upstream/{{ final_name }}.yaml'
       become: true
-   
-    - name: Fix the ownership of the target dir
+
+    - name: Fix the ownership of the target dir Virt-Lightning
       file:
         path: '{{ dest_dir }}'
         state: directory
         recurse: yes
         owner: goneri
         group: goneri
       become: true
+
+    - name: upload the qcow2 file
+      openstack.cloud.object:
+        container: bsd-cloud-image.org
+        name: "{{ qcow2_swift_path }}"
+        filename: '/var/lib/virt-lightning/pool/upstream/{{ final_name }}.qcow2'
+        container_access: public
+
+    - name: upload the YAML file
+      openstack.cloud.object:
+        container: bsd-cloud-image.org
+        name: "{{ yaml_swift_path }}"
+        filename: '/var/lib/virt-lightning/pool/upstream/{{ final_name }}.yaml'
+        container_access: public
+
+    - debug:
+        msg: "Image availabe at: https://object-storage.public.mtl1.vexxhost.net/swift/v1/1dbafeefbd4f4c80864414a441e72dd2/bsd-cloud-image.org/{{ qcow2_swift_path }}"

refresh_images.sh

@@ -1,2 +1,3 @@
 ansible-core
 virt-lightning
+openstacksdk

requirements.txt

@@ -23,15 +23,10 @@ function run_test() {
 
 }
 
-for target in openbsd-7.0 openbsd-6.9 netbsd-9.2 netbsd-8.2 freebsd-13.0-zfs freebsd-13.0-ufs; do
+#for target in dragonflybsd-6.0.1-hammer2 dragonflybsd-6.0.1-ufs openbsd-7.0 openbsd-6.9 freebsd-13.0-zfs freebsd-13.0-ufs; do
+for target in dragonflybsd-6.0.1-ufs; do
     run_test ${target} 2>&1 | tee ${log_dir}/${target}-build.log
 done
 
-#os=dragonflybsd
-#for version in 5.8.3; do
-#    run_test ${os} ${version} ${repo} > ${log_dir}/${os}-${version}-build.log 2>&1
-#done
-
-
 sudo find /var/www/bsd-cloud-image.org -type f -exec chmod 644 {} \;
 sudo find /var/www/bsd-cloud-image.org -type d -exec chmod 755 {} \;

run.sh

@@ -10,4 +10,4 @@ dependencies:
     - bash
     - mozilla-rootcerts
 builder_repo: https://github.com/virt-lightning/netbsd-cloud-images
-python_interpreter: /usr/pkg/bin/python3.7
+python_interpreter: /usr/pkg/bin/python3.8